Skip to content

Commit a590377

Browse files
committed
Update the CI matrix
1 parent 71b9a8a commit a590377

File tree

5 files changed

+34
-24
lines changed

5 files changed

+34
-24
lines changed

.github/workflows/tests.yml

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,47 @@ name: Tests
33
on: [push]
44

55
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
9+
strategy:
10+
fail-fast: false
11+
steps:
12+
- uses: actions/checkout@v4
13+
14+
- name: Set up Ruby
15+
uses: ruby/setup-ruby@v1
16+
with:
17+
ruby-version: '2.7'
18+
bundler-cache: true
19+
20+
- name: Lint Ruby
21+
run: |
22+
bin/rubocop
23+
624
ruby-tests:
725
runs-on: ubuntu-latest
826

927
strategy:
28+
fail-fast: false
1029
matrix:
11-
ruby: [ '2.6' ]
30+
ruby: [ '2.7', '3.0', '3.1', '3.2' ]
1231
steps:
13-
- uses: actions/checkout@v2
14-
- name: Set up Ruby ${{ matrix.ruby }}
15-
uses: actions/setup-ruby@v1
16-
with:
17-
ruby-version: ${{ matrix.ruby }}
32+
- uses: actions/checkout@v4
33+
1834
- name: Setup timezone
1935
uses: zcong1993/setup-timezone@master
2036
with:
2137
timezone: UTC
22-
- name: Lint Ruby
23-
run: |
24-
gem install bundler
25-
bundle install --jobs 4 --retry 3
26-
bin/rubocop
38+
39+
- name: Set up Ruby ${{ matrix.ruby }}
40+
uses: ruby/setup-ruby@v1
41+
with:
42+
ruby-version: ${{ matrix.ruby }}
43+
bundler-cache: true
44+
2745
- name: Run Ruby tests
2846
run: |
29-
gem install bundler
30-
bundle install --jobs 4 --retry 3
3147
bin/rake test
3248
env:
3349
SUITE: ruby

.rubocop.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ inherit_gem:
22
rubocop-shopify: rubocop.yml
33

44
AllCops:
5-
TargetRubyVersion: 2.6
6-
CacheRootDirectory: tmp/rubocop
5+
TargetRubyVersion: 2.7
6+
CacheRootDirectory: tmp/rubocop-cache
77
UseCache: true
88

99
Style/MethodCallWithArgsParentheses:
@@ -18,6 +18,8 @@ Style/MethodCallWithArgsParentheses:
1818
- refute_nil
1919
- assert_kind_of
2020
- refute_kind_of
21+
- assert_predicate
22+
- refute_predicate
2123

2224
Naming/FileName:
2325
Exclude:

.travis.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ GEM
7373

7474
PLATFORMS
7575
arm64-darwin-22
76+
x86_64-linux
7677

7778
DEPENDENCIES
7879
activesupport
7980
github-authentication!
8081
minitest (~> 5.0)
8182
mocha (~> 2)
8283
rake (~> 13)
83-
rubocop (~> 0.52)
8484
rubocop-shopify
8585
timecop (~> 0.9)
8686
vcr (~> 6.2)

github-authentication.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ Gem::Specification.new do |spec|
4343
spec.add_development_dependency("mocha", "~> 2")
4444
spec.add_development_dependency("webmock", "~> 3.8")
4545
spec.add_development_dependency("vcr", "~> 6.2")
46-
spec.add_development_dependency("rubocop", "~> 0.52")
4746
spec.add_development_dependency("rubocop-shopify")
4847
spec.add_development_dependency("activesupport")
4948
end

0 commit comments

Comments
 (0)