Skip to content

Commit aedb879

Browse files
committed
Allow Active Support 7.0
Also: - Test against latest ruby versions - Test against Rails 6.1 - Use setup-ruby@v1 action - Update Gemfile.lock
1 parent 10aa3de commit aedb879

File tree

6 files changed

+453
-140
lines changed

6 files changed

+453
-140
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,16 @@ jobs:
1919
fail-fast: false
2020

2121
matrix:
22-
ruby: [2.5.8, 2.6.6, 2.7.2, 3.0.0, jruby-9.2.16.0]
22+
ruby: [2.5.9, 2.6.9, 2.7.5, 3.0.3, jruby-9.3.2.0]
23+
deps: [rails_61, rails_70]
2324

24-
env:
25-
BUNDLE_PATH: vendor/bundle
25+
exclude:
26+
- deps: rails_70
27+
ruby: 2.5.9
28+
- deps: rails_70
29+
ruby: 2.6.9
30+
- deps: rails_70
31+
ruby: jruby-9.3.2.0
2632

2733
steps:
2834
- uses: actions/checkout@v2
@@ -32,20 +38,22 @@ jobs:
3238
ruby-version: ${{ matrix.ruby }}
3339
bundler: none
3440

35-
- name: Install a specific rubygems version
36-
run: gem update --system 3.2.0.rc.1
41+
- name: Configure bundler (default)
42+
run: |
43+
echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV
44+
echo "BUNDLE_PATH=$(pwd)/vendor/bundle" >> $GITHUB_ENV
45+
if: matrix.deps == 'rails_70'
3746

38-
- name: Install a specific bundler version
39-
run: gem install bundler -v 2.1.4
47+
- name: Configure bundler (alternative)
48+
run: |
49+
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}.gemfile" >> $GITHUB_ENV
50+
echo "BUNDLE_PATH=$(pwd)/gemfiles/${{ matrix.deps }}/vendor/bundle" >> $GITHUB_ENV
51+
if: matrix.deps != 'rails_70'
4052

41-
- name: Restore cached dependencies
42-
uses: actions/cache@v2
53+
- uses: ruby/setup-ruby@v1
4354
with:
44-
path: ${{ env.BUNDLE_PATH }}
45-
key: gems-${{ matrix.ruby }}-${{ hashFiles('current_gemfile.lock') }}
46-
47-
- name: Install dependencies
48-
run: bundle install --jobs 3
55+
ruby-version: ${{ matrix.ruby }}
56+
bundler-cache: true
4957

5058
- name: Run tests
5159
run: bundle exec rake

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ group :release do
2020
end
2121

2222
group :rails do
23-
gem 'rails', '~> 6.1.a'
23+
gem 'rails', '~> 7.0.0'
2424
gem 'rspec-rails'
2525
gem 'combustion'
2626
gem 'capybara'

0 commit comments

Comments
 (0)