Skip to content

Commit

Permalink
Fix CI (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
DmitryTsepelev authored Aug 29, 2023
1 parent e66bad5 commit 49ea2f2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 21 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [jruby, 2.6, 2.7, "3.0", 3.1, 3.2]
ruby: [jruby, "3.0", 3.1, 3.2]

gemfile: [
"gemfiles/jruby.gemfile",
"gemfiles/rails_6_0.gemfile",
"gemfiles/rails_6_2.gemfile",
"gemfiles/rails_7_0.gemfile"
]
Expand All @@ -33,31 +32,20 @@ jobs:
- false

exclude:
- ruby: jruby
gemfile: gemfiles/rails_6_0.gemfile
- ruby: jruby
gemfile: gemfiles/rails_6_2.gemfile
- ruby: jruby
gemfile: gemfiles/rails_7_0.gemfile
- ruby: jruby
gemfile: gemfiles/railsmaster.gemfile

- ruby: 2.6
gemfile: gemfiles/jruby.gemfile
- ruby: 2.7
gemfile: gemfiles/jruby.gemfile
- ruby: "3.0"
gemfile: gemfiles/jruby.gemfile
- ruby: 3.1
gemfile: gemfiles/jruby.gemfile
- ruby: 3.2
gemfile: gemfiles/jruby.gemfile

- ruby: 2.6
gemfile: gemfiles/rails_7_0.gemfile
- ruby: 2.6
gemfile: gemfiles/railsmaster.gemfile

include:
- ruby: ruby-head
gemfile: gemfiles/railsmaster.gemfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
ruby-version: 2.7
- name: Lint Ruby code with RuboCop
run: |
bundle install --gemfile gemfiles/rails_6_0.gemfile --jobs 4 --retry 3
bundle exec --gemfile gemfiles/rails_6_0.gemfile rubocop
bundle install --gemfile gemfiles/rails_7_0.gemfile --jobs 4 --retry 3
bundle exec --gemfile gemfiles/rails_7_0.gemfile rubocop
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

## master

- [PR #154](https://github.com/DmitryTsepelev/store_model/pull/154) Fix serialization on nested objects ([@mweitzel])

## 2.1.0 (2023-06-31)

- [PR #152](https://github.com/DmitryTsepelev/store_model/pull/152) Use accepts_nested_attributes_for with StoreModel::NestedAttributes ([@morgangrubb])
Expand Down Expand Up @@ -190,3 +192,4 @@
[@penguoir]: https://github.com/penguoir
[@RudskikhIvan]: https://github.com/RudskikhIvan
[@morgangrubb]: https://github.com/morgangrubb
[@mweitzel]: https://github.com/mweitzel
6 changes: 0 additions & 6 deletions gemfiles/rails_6_0.gemfile

This file was deleted.

0 comments on commit 49ea2f2

Please sign in to comment.