Skip to content

Commit bd4f58a

Browse files
st0012st0012
authored
Fix CI and simplify matrix (#2230)
1 parent d408bdd commit bd4f58a

7 files changed

+67
-88
lines changed

‎.github/workflows/sentry_delayed_job_test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,24 @@ jobs:
2424
run:
2525
working-directory: sentry-delayed_job
2626
name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
27-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
2828
strategy:
2929
matrix:
3030
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
31-
os: [ubuntu-latest]
3231
include:
3332
- {
34-
os: ubuntu-latest,
3533
ruby_version: "3.2",
3634
options:
3735
{
3836
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
3937
},
4038
}
41-
- { os: ubuntu-latest, ruby_version: "3.2", options: { codecov: 1 } }
39+
- { ruby_version: "3.2", options: { codecov: 1 } }
40+
exclude:
41+
# Because Rails 7.0 currently doesn't work with Ruby head
42+
# LoadError:
43+
# cannot load such file -- mutex_m
44+
- { ruby_version: "head" }
4245
steps:
4346
- uses: actions/checkout@v1
4447
- name: Install sqlite

‎.github/workflows/sentry_opentelemetry_test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,20 @@ jobs:
2424
run:
2525
working-directory: sentry-opentelemetry
2626
name: Ruby ${{ matrix.ruby_version }} & OpenTelemetry ${{ matrix.opentelemetry_version }}, options - ${{ toJson(matrix.options) }}
27-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
2828
strategy:
2929
matrix:
3030
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
3131
# opentelemetry_version: [1.2.0]
32-
os: [ubuntu-latest]
3332
include:
3433
- {
35-
os: ubuntu-latest,
3634
ruby_version: 3.2,
3735
options:
3836
{
3937
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
4038
},
4139
}
42-
- { os: ubuntu-latest, ruby_version: 3.2, options: { codecov: 1 } }
40+
- { ruby_version: 3.2, options: { codecov: 1 } }
4341
steps:
4442
- uses: actions/checkout@v1
4543

‎.github/workflows/sentry_rails_test.yml

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,33 @@ jobs:
1818
run:
1919
working-directory: sentry-rails
2020
name: Ruby ${{ matrix.ruby_version }} & Rails ${{ matrix.rails_version }}, options - ${{ toJson(matrix.options) }}
21-
runs-on: ${{ matrix.os }}
21+
runs-on: ubuntu-latest
2222
strategy:
2323
fail-fast: false
2424
matrix:
2525
rails_version: [6.1.0, 7.0.0, 7.1.0]
2626
ruby_version: [2.7, "3.0", "3.1", "3.2", "3.3"]
27-
os: [ubuntu-latest]
2827
include:
29-
- { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.0.0 }
30-
- { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.1.0 }
31-
- { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.2.0 }
32-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 5.0.0 }
33-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 5.1.0 }
34-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 5.2.0 }
35-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 6.0.0 }
36-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 6.1.0 }
37-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 5.0.0 }
38-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 5.1.0 }
39-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 5.2.0 }
40-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 6.0.0 }
41-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 6.1.0 }
42-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 5.0.0 }
43-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 5.1.0 }
44-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 5.2.0 }
45-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 6.0.0 }
46-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 6.1.0 }
47-
- { os: ubuntu-latest, ruby_version: "jruby", rails_version: 6.1.0 }
28+
- { ruby_version: "2.4", rails_version: 5.0.0 }
29+
- { ruby_version: "2.4", rails_version: 5.1.0 }
30+
- { ruby_version: "2.4", rails_version: 5.2.0 }
31+
- { ruby_version: "2.5", rails_version: 5.0.0 }
32+
- { ruby_version: "2.5", rails_version: 5.1.0 }
33+
- { ruby_version: "2.5", rails_version: 5.2.0 }
34+
- { ruby_version: "2.5", rails_version: 6.0.0 }
35+
- { ruby_version: "2.5", rails_version: 6.1.0 }
36+
- { ruby_version: "2.6", rails_version: 5.0.0 }
37+
- { ruby_version: "2.6", rails_version: 5.1.0 }
38+
- { ruby_version: "2.6", rails_version: 5.2.0 }
39+
- { ruby_version: "2.6", rails_version: 6.0.0 }
40+
- { ruby_version: "2.6", rails_version: 6.1.0 }
41+
- { ruby_version: "2.7", rails_version: 5.0.0 }
42+
- { ruby_version: "2.7", rails_version: 5.1.0 }
43+
- { ruby_version: "2.7", rails_version: 5.2.0 }
44+
- { ruby_version: "2.7", rails_version: 6.0.0 }
45+
- { ruby_version: "2.7", rails_version: 6.1.0 }
46+
- { ruby_version: "jruby", rails_version: 6.1.0 }
4847
- {
49-
os: ubuntu-latest,
5048
ruby_version: "3.2",
5149
rails_version: 7.1.0,
5250
options:
@@ -55,7 +53,6 @@ jobs:
5553
},
5654
}
5755
- {
58-
os: ubuntu-latest,
5956
ruby_version: "3.2",
6057
rails_version: 7.1.0,
6158
options: { codecov: 1 },

‎.github/workflows/sentry_raven_test.yml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- master
88
pull_request:
99
paths:
10-
- 'sentry-raven/**'
11-
- '.github/workflows/sentry_raven_test.yml'
10+
- "sentry-raven/**"
11+
- ".github/workflows/sentry_raven_test.yml"
1212
# Cancel in progress workflows on pull_requests.
1313
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
1414
concurrency:
@@ -20,14 +20,13 @@ jobs:
2020
run:
2121
working-directory: sentry-raven
2222
name: Test on ruby ${{ matrix.ruby_version }} and rails ${{ matrix.rails_version }}
23-
runs-on: ${{ matrix.os }}
23+
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
2626
rails_version: [0, 4.2, 5.2, 6.0.0]
27-
ruby_version: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', jruby-9.3]
28-
os: [ubuntu-latest]
27+
ruby_version: [2.3, 2.4, 2.5, 2.6, 2.7, "3.0", jruby-9.3]
2928
include:
30-
- ruby_version: '3.0'
29+
- ruby_version: "3.0"
3130
rails_version: 0
3231
- ruby_version: 2.7
3332
rails_version: 6.0.0
@@ -41,30 +40,30 @@ jobs:
4140
rails_version: 4.2
4241
- ruby_version: jruby-9.3
4342
rails_version: 4.2
44-
- ruby_version: '3.0'
43+
- ruby_version: "3.0"
4544
rails_version: 4.2
46-
- ruby_version: '3.0'
45+
- ruby_version: "3.0"
4746
rails_version: 5.2
48-
- ruby_version: '3.0'
47+
- ruby_version: "3.0"
4948
rails_version: 6.0.0
5049

5150
steps:
52-
- uses: actions/checkout@v1
51+
- uses: actions/checkout@v1
5352

54-
- name: Set up Ruby ${{ matrix.ruby_version }}
55-
uses: ruby/setup-ruby@v1
56-
with:
57-
bundler: 1
58-
ruby-version: ${{ matrix.ruby_version }}
53+
- name: Set up Ruby ${{ matrix.ruby_version }}
54+
uses: ruby/setup-ruby@v1
55+
with:
56+
bundler: 1
57+
ruby-version: ${{ matrix.ruby_version }}
5958

60-
- name: Start Redis
61-
uses: supercharge/[email protected]
62-
with:
63-
redis-version: 5
59+
- name: Start Redis
60+
uses: supercharge/[email protected]
61+
with:
62+
redis-version: 5
6463

65-
- name: Build with Rails ${{ matrix.rails_version }}
66-
env:
67-
RAILS_VERSION: ${{ matrix.rails_version }}
68-
run: |
69-
bundle install --jobs 4 --retry 3
70-
bundle exec rake
64+
- name: Build with Rails ${{ matrix.rails_version }}
65+
env:
66+
RAILS_VERSION: ${{ matrix.rails_version }}
67+
run: |
68+
bundle install --jobs 4 --retry 3
69+
bundle exec rake

‎.github/workflows/sentry_resque_test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,19 @@ jobs:
2424
run:
2525
working-directory: sentry-resque
2626
name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
27-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
2828
strategy:
2929
matrix:
3030
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
31-
os: [ubuntu-latest]
3231
include:
3332
- {
34-
os: ubuntu-latest,
3533
ruby_version: "3.2",
3634
options:
3735
{
3836
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
3937
},
4038
}
41-
- { os: ubuntu-latest, ruby_version: "3.2", options: { codecov: 1 } }
39+
- { ruby_version: "3.2", options: { codecov: 1 } }
4240
steps:
4341
- uses: actions/checkout@v1
4442
- name: Set up Ruby ${{ matrix.ruby_version }}

‎.github/workflows/sentry_ruby_test.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,16 @@ jobs:
2424
run:
2525
working-directory: sentry-ruby
2626
name: Ruby ${{ matrix.ruby_version }} & Rack ${{ matrix.rack_version }}, options - ${{ toJson(matrix.options) }}
27-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
2828
strategy:
2929
matrix:
3030
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
3131
rack_version: [2.0, 3.0]
3232
redis_rb_version: [4.0]
33-
os: [ubuntu-latest]
3433
include:
34+
- { ruby_version: 3.2, rack_version: 0, redis_rb_version: 5.0 }
35+
- { ruby_version: 3.2, rack_version: 2.0, redis_rb_version: 5.0 }
3536
- {
36-
os: ubuntu-latest,
37-
ruby_version: 3.2,
38-
rack_version: 0,
39-
redis_rb_version: 5.0,
40-
}
41-
- {
42-
os: ubuntu-latest,
43-
ruby_version: 3.2,
44-
rack_version: 2.0,
45-
redis_rb_version: 5.0,
46-
}
47-
- {
48-
os: ubuntu-latest,
4937
ruby_version: 3.2,
5038
rack_version: 3.0,
5139
redis_rb_version: 5.0,
@@ -55,7 +43,6 @@ jobs:
5543
},
5644
}
5745
- {
58-
os: ubuntu-latest,
5946
ruby_version: 3.2,
6047
rack_version: 3.0,
6148
redis_rb_version: 5.0,

‎.github/workflows/sentry_sidekiq_test.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,21 @@ jobs:
1818
run:
1919
working-directory: sentry-sidekiq
2020
name: Ruby ${{ matrix.ruby_version }} & Sidekiq ${{ matrix.sidekiq_version }}, options - ${{ toJson(matrix.options) }}
21-
runs-on: ${{ matrix.os }}
21+
runs-on: ubuntu-latest
2222
strategy:
2323
matrix:
2424
sidekiq_version: ["5.0", "6.0", "7.0"]
2525
ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3", jruby]
26-
os: [ubuntu-latest]
2726
include:
28-
- { os: ubuntu-latest, ruby_version: 2.4, sidekiq_version: 5.0 }
29-
- { os: ubuntu-latest, ruby_version: 2.5, sidekiq_version: 5.0 }
30-
- { os: ubuntu-latest, ruby_version: 2.5, sidekiq_version: 6.0 }
31-
- { os: ubuntu-latest, ruby_version: 2.6, sidekiq_version: 5.0 }
32-
- { os: ubuntu-latest, ruby_version: 2.6, sidekiq_version: 6.0 }
33-
- { os: ubuntu-latest, ruby_version: jruby, sidekiq_version: 5.0 }
34-
- { os: ubuntu-latest, ruby_version: jruby, sidekiq_version: 6.0 }
35-
- { os: ubuntu-latest, ruby_version: jruby, sidekiq_version: 7.0 }
27+
- { ruby_version: 2.4, sidekiq_version: 5.0 }
28+
- { ruby_version: 2.5, sidekiq_version: 5.0 }
29+
- { ruby_version: 2.5, sidekiq_version: 6.0 }
30+
- { ruby_version: 2.6, sidekiq_version: 5.0 }
31+
- { ruby_version: 2.6, sidekiq_version: 6.0 }
32+
- { ruby_version: jruby, sidekiq_version: 5.0 }
33+
- { ruby_version: jruby, sidekiq_version: 6.0 }
34+
- { ruby_version: jruby, sidekiq_version: 7.0 }
3635
- {
37-
os: ubuntu-latest,
3836
ruby_version: "3.2",
3937
sidekiq_version: 7.0,
4038
options:
@@ -43,7 +41,6 @@ jobs:
4341
},
4442
}
4543
- {
46-
os: ubuntu-latest,
4744
ruby_version: "3.2",
4845
sidekiq_version: 7.0,
4946
options: { codecov: 1 },

0 commit comments

Comments
 (0)