Skip to content

Commit 014c800

Browse files
authored
Merge pull request #722 from bugsnag/test/ruby-3.1
Add Ruby 3.1 to CI matrix
2 parents 9db957d + 7e8b0da commit 014c800

File tree

2 files changed

+62
-9
lines changed

2 files changed

+62
-9
lines changed

.buildkite/pipeline.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,17 @@ steps:
216216
concurrency: 4
217217
concurrency_group: 'ruby/unit-tests'
218218

219+
- label: ':ruby: Ruby 3.1 unit tests'
220+
timeout_in_minutes: 30
221+
plugins:
222+
docker-compose#v3.1.0:
223+
run: ruby-unit-tests
224+
use-aliases: true
225+
env:
226+
RUBY_TEST_VERSION: "3.1"
227+
concurrency: 4
228+
concurrency_group: 'ruby/unit-tests'
229+
219230
- label: ':ruby: Ruby 1.9 plain tests'
220231
timeout_in_minutes: 30
221232
plugins:
@@ -328,6 +339,18 @@ steps:
328339
concurrency: 8
329340
concurrency_group: 'ruby/slow-maze-runner-tests'
330341

342+
- label: ':ruby: Ruby 3.1 plain tests'
343+
timeout_in_minutes: 30
344+
plugins:
345+
docker-compose#v3.1.0:
346+
run: ruby-maze-runner
347+
use-aliases: true
348+
command: ["features/plain_features/", "--tags", "not @wip"]
349+
env:
350+
RUBY_TEST_VERSION: "3.1"
351+
concurrency: 8
352+
concurrency_group: 'ruby/slow-maze-runner-tests'
353+
331354
- label: ':sidekiq: Sidekiq 2 tests'
332355
timeout_in_minutes: 30
333356
plugins:
@@ -591,6 +614,19 @@ steps:
591614
concurrency: 8
592615
concurrency_group: 'ruby/slow-maze-runner-tests'
593616

617+
- label: ':rails: Rails 6 Ruby 3.1 tests'
618+
timeout_in_minutes: 30
619+
plugins:
620+
docker-compose#v3.1.0:
621+
run: ruby-maze-runner
622+
use-aliases: true
623+
command: ["features/rails_features/", "--tags", "@rails6 and not @wip"]
624+
env:
625+
RUBY_TEST_VERSION: "3.1"
626+
RAILS_VERSION: "6"
627+
concurrency: 8
628+
concurrency_group: 'ruby/slow-maze-runner-tests'
629+
594630
- label: ':rails: Rails 7 Ruby 3.0 tests'
595631
timeout_in_minutes: 30
596632
plugins:
@@ -746,6 +782,18 @@ steps:
746782
concurrency: 4
747783
concurrency_group: 'ruby/integrations-maze-runner-tests'
748784

785+
- label: ':clipboard: Rake Ruby 3.1 tests'
786+
timeout_in_minutes: 30
787+
plugins:
788+
docker-compose#v3.1.0:
789+
run: ruby-maze-runner
790+
use-aliases: true
791+
command: ['features/rake.feature', '--tags', 'not @wip']
792+
env:
793+
RUBY_TEST_VERSION: "3.1"
794+
concurrency: 4
795+
concurrency_group: 'ruby/integrations-maze-runner-tests'
796+
749797
- label: ':postbox: Mailman Ruby 2.0 tests'
750798
timeout_in_minutes: 30
751799
plugins:
@@ -1231,6 +1279,19 @@ steps:
12311279
concurrency: 4
12321280
concurrency_group: 'ruby/integrations-maze-runner-tests'
12331281

1282+
- label: ':bed: Rack 2 Ruby 3.1 tests'
1283+
timeout_in_minutes: 30
1284+
plugins:
1285+
docker-compose#v3.1.0:
1286+
run: ruby-maze-runner
1287+
use-aliases: true
1288+
command: ['features/rack.feature', '--tags', 'not @wip']
1289+
env:
1290+
RUBY_TEST_VERSION: "3.1"
1291+
RACK_VERSION: '2'
1292+
concurrency: 4
1293+
concurrency_group: 'ruby/integrations-maze-runner-tests'
1294+
12341295
- name: ':copyright: License Audit'
12351296
plugins:
12361297
docker-compose#v3.7.0:

Gemfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,7 @@ group :test, optional: true do
2020

2121
gem 'hashdiff', ruby_version <= Gem::Version.new('1.9.3') ? '0.3.8': '>0.3.8'
2222

23-
if ruby_version >= Gem::Version.new('3.0.0')
24-
gem 'did_you_mean', '~> 1.5.0'
25-
elsif ruby_version >= Gem::Version.new('2.7.0')
26-
gem 'did_you_mean', '~> 1.4.0'
27-
elsif ruby_version >= Gem::Version.new('2.5.0')
28-
gem 'did_you_mean', '~> 1.3.1'
29-
elsif ruby_version >= Gem::Version.new('2.4.0')
30-
gem 'did_you_mean', '~> 1.1.0'
31-
elsif ruby_version >= Gem::Version.new('2.3.0')
23+
if ruby_version >= Gem::Version.new('2.3.0') && ruby_version <= Gem::Version.new('2.4.0')
3224
gem 'did_you_mean', '~> 1.0.4'
3325
end
3426

0 commit comments

Comments
 (0)