Skip to content

Commit

Permalink
Merge pull request #52 from Fryguy/github_actions
Browse files Browse the repository at this point in the history
Switch to GitHub Actions
  • Loading branch information
Fryguy authored Jan 7, 2022
2 parents 3817ddd + 6ff2a3a commit 447a073
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 26 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: CI

on: [push, pull_request]

jobs:
ci:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version:
- '2.0'
- '2.1'
- '2.2'
- '2.3'
- '2.4'
- '2.5'
- '2.6'
- '2.7'
- '3.0'
allow-failure: [false]
include:
- ruby-version: ruby-head
allow-failure: true
- ruby-version: jruby-head
allow-failure: true
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- name: Run tests
run: bundle exec rake
continue-on-error: ${{ matrix.allow-failure }}
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
DeepMerge Overview
==================
DeepMerge
=========

[![Gem Version](https://badge.fury.io/rb/deep_merge.svg)](http://badge.fury.io/rb/deep_merge)
[![CI](https://github.com/ManageIQ/deep_merge/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/deep_merge/actions/workflows/ci.yaml)

Deep Merge is a simple set of utility functions for Hash. It permits you to merge elements inside a hash together recursively. The manner by which it does this is somewhat arbitrary (since there is no defining standard for this) but it should end up being pretty intuitive and do what you expect.

Expand All @@ -21,6 +24,7 @@ By default, `deep_merge!` will overwrite any unmergeables and merge everything e

Options
-------

Options are specified in the last parameter passed, which should be in hash format:

hash.deep_merge!({:x => [1,2]}, {:knockout_prefix => '--'})
Expand Down Expand Up @@ -135,8 +139,8 @@ Simple Example Code
y.deep_merge!(x)
# results: y = {:x => [1,2,3,4,5]}

Availablility
=============
Availability
============

`deep_merge` was written by Steve Midgley, and is now maintained by Daniel DeLeo. The official home of `deep_merge` on the internet is now https://github.com/danielsdeleo/deep_merge

Expand Down

0 comments on commit 447a073

Please sign in to comment.