Skip to content

Commit

Permalink
Merge branch 'steveh-rails7'
Browse files Browse the repository at this point in the history
* steveh-rails7:
  Update CI workflow to accomodate ruby/activemodel compatibility
  Support Rails 7
  • Loading branch information
rmm5t committed Dec 20, 2021
2 parents 1915785 + 3e50a88 commit 709cfa7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [2.5, 2.6, 2.7]
ruby: [2.7, 3.0]
gemfile:
- activemodel-5.2
- activemodel-6.0
- activemodel-6.1
- activemodel-7.0
- activemodel-main
include:
- { ruby: "2.3", gemfile: "activemodel-3.2" }
- { ruby: "2.3", gemfile: "activemodel-4.2" }
- { ruby: "2.4", gemfile: "activemodel-4.2" }
- { ruby: "2.5", gemfile: "activemodel-5.2" }
- { ruby: "2.6", gemfile: "activemodel-6.1" }

env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
Expand Down
5 changes: 5 additions & 0 deletions gemfiles/activemodel-7.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gem "activemodel", "~> 7.0.0"

gemspec path: "../"
4 changes: 2 additions & 2 deletions strip_attributes.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
spec.test_files = `git ls-files -- {test,spec}/*`.split("\n")
spec.require_paths = ["lib"]

spec.add_runtime_dependency "activemodel", ">= 3.0", "< 7.0"
spec.add_development_dependency "active_attr", "~> 0.10"
spec.add_runtime_dependency "activemodel", ">= 3.0", "< 8.0"
spec.add_development_dependency "active_attr", "~> 0.15"
spec.add_development_dependency "minitest", ">= 5.0", "< 6.0"
spec.add_development_dependency "minitest-matchers_vaccine", "~> 1.0" unless ENV["SKIP_VACCINE"]
spec.add_development_dependency "minitest-reporters", ">= 0.14.24"
Expand Down

0 comments on commit 709cfa7

Please sign in to comment.