Skip to content

Commit 1061594

Browse files
authored
Merge pull request #67 from bastelfreak/ci3
CI: Generate ruby matrix dynamically
2 parents 876e89c + 9c4bb1f commit 1061594

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,34 @@ permissions:
1212
contents: read
1313

1414
jobs:
15-
rubocop_checks:
15+
rubocop_and_matrix:
1616
runs-on: ubuntu-24.04
17-
name: RuboCop
17+
outputs:
18+
ruby: ${{ steps.ruby.outputs.versions }}
1819
steps:
19-
- name: Checkout current PR
20-
uses: actions/checkout@v6
21-
22-
- name: Rubocop checks
20+
- uses: actions/checkout@v6
21+
- name: Install Ruby ${{ matrix.ruby }}
2322
uses: ruby/setup-ruby@v1
2423
with:
25-
ruby-version: '2.7'
24+
ruby-version: "3.4"
2625
bundler-cache: true
27-
- run: bundle exec rake rubocop
26+
- name: Run Rubocop
27+
run: bundle exec rake rubocop
2828
- run: gem build --strict --verbose *.gemspec
29+
- id: ruby
30+
uses: voxpupuli/ruby-version@v2
2931

3032
linux_unit_tests:
3133
needs:
32-
- rubocop_checks
34+
- rubocop_and_matrix
3335
name: Unit tests on Linux with Ruby ${{ matrix.ruby }}
3436
strategy:
3537
fail-fast: false
3638
matrix:
37-
ruby:
38-
- '2.7'
39-
- '3.0'
40-
- '3.2'
41-
- '3.3'
42-
- '3.4'
43-
- '4.0'
44-
- 'jruby-9.4.12.1'
45-
- 'jruby-9.4.8.0'
39+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
40+
include:
41+
- ruby: 'jruby-9.4.12.1'
42+
- ruby: 'jruby-9.4.8.0'
4643
runs-on: ubuntu-24.04
4744
steps:
4845
- name: Checkout current PR
@@ -163,7 +160,7 @@ jobs:
163160
tests:
164161
if: always()
165162
needs:
166-
- rubocop_checks
163+
- rubocop_and_matrix
167164
- linux_unit_tests
168165
- windows_unit_tests
169166
- acceptance_tests

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55
gemspec
66

77
group(:release, optional: true) do
8-
gem 'faraday-retry', '~> 2.1', require: false
8+
gem 'faraday-retry', '~> 2.1', require: false if RUBY_VERSION >= '2.6'
99
gem 'github_changelog_generator', '~> 1.16.4', require: false
1010
end
1111

0 commit comments

Comments
 (0)