Add Ruby 3.3 to CI matrix (#2208)

* Use the official ruby_versions action for workflow For these gems' CI, using the ruby_versions action will make the Ruby version matrix slightly easier to maintain. * Add Ruby 3.3 to sentry-rails & sentry-sidekiq's matrix manually
getsentry · Dec 29, 2023 · babdd55 · babdd55
1 parent b420bf8
commit babdd55
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/sentry_delayed_job_test.yml b/.github/workflows/sentry_delayed_job_test.yml
@@ -13,15 +13,21 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-jruby
+      min_version: 2.4
   test:
+    needs: ruby-versions
     defaults:
       run:
         working-directory: sentry-delayed_job
     name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.4, 2.5, 2.6, 2.7, "3.0", "3.1", "3.2", jruby]
+        ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ubuntu-latest]
         include:
           - {

diff --git a/.github/workflows/sentry_opentelemetry_test.yml b/.github/workflows/sentry_opentelemetry_test.yml
@@ -13,15 +13,21 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-jruby
+      min_version: 2.6
   test:
+    needs: ruby-versions
     defaults:
       run:
         working-directory: sentry-opentelemetry
     name: Ruby ${{ matrix.ruby_version }} & OpenTelemetry ${{ matrix.opentelemetry_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.6, 2.7, "3.0", "3.1", "3.2", jruby]
+        ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         # opentelemetry_version: [1.2.0]
         os: [ubuntu-latest]
         include:

diff --git a/.github/workflows/sentry_rails_test.yml b/.github/workflows/sentry_rails_test.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         rails_version: [6.1.0, 7.0.0, 7.1.0]
-        ruby_version: [2.7, "3.0", "3.1", "3.2"]
+        ruby_version: [2.7, "3.0", "3.1", "3.2", "3.3"]
         os: [ubuntu-latest]
         include:
           - { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.0.0 }

diff --git a/.github/workflows/sentry_resque_test.yml b/.github/workflows/sentry_resque_test.yml
@@ -13,15 +13,21 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-jruby
+      min_version: 2.4
   test:
+    needs: ruby-versions
     defaults:
       run:
         working-directory: sentry-resque
     name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.4, 2.5, 2.6, 2.7, "3.0", "3.1", "3.2", jruby]
+        ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ubuntu-latest]
         include:
           - {

diff --git a/.github/workflows/sentry_ruby_test.yml b/.github/workflows/sentry_ruby_test.yml
@@ -13,15 +13,21 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-jruby
+      min_version: 2.4
   test:
+    needs: ruby-versions
     defaults:
       run:
         working-directory: sentry-ruby
     name: Ruby ${{ matrix.ruby_version }} & Rack ${{ matrix.rack_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.4, 2.5, 2.6, 2.7, "3.0", "3.1", "3.2", jruby]
+        ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         rack_version: [2.0, 3.0]
         redis_rb_version: [4.0]
         os: [ubuntu-latest]

diff --git a/.github/workflows/sentry_sidekiq_test.yml b/.github/workflows/sentry_sidekiq_test.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         sidekiq_version: ["5.0", "6.0", "7.0"]
-        ruby_version: ["2.7", "3.0", "3.1", "3.2", jruby]
+        ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3", jruby]
         os: [ubuntu-latest]
         include:
           - { os: ubuntu-latest, ruby_version: 2.4, sidekiq_version: 5.0 }