Skip to content

Commit

Permalink
Improve CI and fix missing assertions (#923)
Browse files Browse the repository at this point in the history 
Backport some changes from 7.2 branch.

- Use only value for Ruby versions to reduce complexity
- Rename `deps` to `rails` for parity with Arbre and Active Admin gems

Close #922
  • Loading branch information
@tagliala
tagliala authored Jun 13, 2024
1 parent a8cd775 commit dbb10ba
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 121 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,17 @@ on:

jobs:
test:
name: test (${{ matrix.ruby.name }}, ${{ matrix.rails }})
name: test (ruby-${{ matrix.ruby }}, ${{ matrix.rails }})
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
ruby:
- name: ruby-3.0
value: "3.0"
- name: ruby-3.1
value: 3.1
- name: ruby-3.2
value: 3.2
- name: ruby-3.3
value: 3.3
- "3.0"
- "3.1"
- "3.2"
- "3.3"
rails:
- rails_61
- rails_70
Expand All @@ -39,17 +35,17 @@ jobs:
if: matrix.rails != 'rails_71'
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby.value }}
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
env:
COVERAGE: true
run: |
bundle exec rake test TESTOPTS="--verbose"
mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby.value }}-${{ matrix.rails }}.xml
mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby }}-${{ matrix.rails }}.xml
- uses: actions/upload-artifact@v4
with:
name: coverage-ruby-${{ matrix.ruby.value }}-${{ matrix.rails }}
name: coverage-ruby-${{ matrix.ruby }}-${{ matrix.rails }}
path: coverage
if-no-files-found: error

Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Version 1.14.0

* Remove upper bound dependency limits from gemspec.
* Allow using Rails 7.1.
* Allow using Rails 7.1 [#873][].
* Remove support for Ruby `< 2.6`.

## Version 1.13.1
Expand Down Expand Up @@ -223,3 +223,5 @@ _No changes_.
* Added more helper_methods.
* Added Rails 2.3.0 and changed tests to work with ActionController::TestCase.
* First release. Support to I18n, singleton controllers, polymorphic controllers, belongs_to, nested_belongs_to and url helpers.

[#873]: https://github.com/activeadmin/inherited_resources/pull/873
144 changes: 66 additions & 78 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,71 +10,71 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.3)
actionpack (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activesupport (= 7.1.3.3)
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.3.3)
actionview (= 7.1.3.3)
activesupport (= 7.1.3.3)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.3)
actionpack (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
actiontext (7.1.3.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.3)
activesupport (= 7.1.3.3)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.3)
activesupport (= 7.1.3.3)
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
globalid (>= 0.3.6)
activemodel (7.1.3.3)
activesupport (= 7.1.3.3)
activerecord (7.1.3.3)
activemodel (= 7.1.3.3)
activesupport (= 7.1.3.3)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
timeout (>= 0.4.0)
activestorage (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activesupport (= 7.1.3.3)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
marcel (~> 1.0)
activesupport (7.1.3.3)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -88,13 +88,11 @@ GEM
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
bigdecimal (3.1.8-java)
builder (3.2.4)
concurrent-ruby (1.3.1)
builder (3.3.0)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.4)
date (3.3.4-java)
docile (1.4.0)
drb (2.2.1)
erubi (1.12.0)
Expand All @@ -106,13 +104,10 @@ GEM
i18n (1.14.5)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
io-console (0.7.2-java)
irb (1.13.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jar-dependencies (0.4.1)
json (2.7.2)
json (2.7.2-java)
language_server-protocol (3.17.0.3)
loofah (2.22.0)
crass (~> 1.0.2)
Expand All @@ -124,7 +119,7 @@ GEM
net-smtp
marcel (1.0.4)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest-reporters (1.6.1)
ansi
Expand All @@ -134,7 +129,7 @@ GEM
mocha (2.3.0)
ruby2_keywords (>= 0.0.5)
mutex_m (0.2.0)
net-imap (0.4.11)
net-imap (0.4.12)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -144,50 +139,46 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nio4r (2.7.3-java)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.5-arm64-darwin)
nokogiri (1.16.5-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.5-java)
nokogiri (1.16.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.2.0)
parallel (1.25.1)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
psych (5.1.2)
stringio
psych (5.1.2-java)
jar-dependencies (>= 0.1.7)
racc (1.8.0)
racc (1.8.0-java)
rack (3.0.11)
rack (3.1.3)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.3)
actioncable (= 7.1.3.3)
actionmailbox (= 7.1.3.3)
actionmailer (= 7.1.3.3)
actionpack (= 7.1.3.3)
actiontext (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activemodel (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
bundler (>= 1.15.0)
railties (= 7.1.3.3)
railties (= 7.1.3.4)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -199,9 +190,9 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
Expand All @@ -212,13 +203,13 @@ GEM
rdoc (6.7.0)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.8)
reline (0.5.9)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.0)
strscan
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -251,7 +242,6 @@ GEM
simplecov_json_formatter (0.1.4)
stringio (3.1.0)
strscan (3.1.0)
strscan (3.1.0-java)
thor (1.3.1)
timeout (0.4.1)
tzinfo (2.0.6)
Expand All @@ -261,14 +251,12 @@ GEM
webrick (1.8.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-driver (0.7.6-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.15)

PLATFORMS
aarch64-linux
arm64-darwin
java
ruby
x86_64-darwin
x86_64-linux
Expand Down
Loading

0 comments on commit dbb10ba

Please sign in to comment.