Add Ruby 3.3, use rubygems; latest in tests.yaml

MSP-Greg · Dec 28, 2023 · 2675d74 · 2675d74
1 parent 198f1e6
commit 2675d74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/rack_conform.yml b/.github/workflows/rack_conform.yml
@@ -23,7 +23,8 @@ jobs:
       matrix:
         include:
           - { os: ubuntu-20.04 , ruby: '2.7' }
-          - { os: ubuntu-22.04 , ruby: '3.2' }
+          - { os: ubuntu-20.04 , ruby: '3.2' }
+          - { os: ubuntu-22.04 , ruby: '3.3' }
           - { os: ubuntu-22.04 , ruby: head  }
 
     env:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, windows-2022 ]
-        ruby: [ 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, head ]
+        ruby: [ 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, head ]
         no-ssl: ['']
         rack-v: ['']
         yjit: ['']
@@ -97,22 +97,14 @@ jobs:
           brew: ragel
           # below is only needed for Ruby 2.4
           mingw: openssl
+          rubygems: latest
           bundler-cache: true
         timeout-minutes: 10
 
       - name: Repo & Commit Info
         if: ${{ needs.skip_duplicate_runs.outputs.should_skip != 'true' }}
         run: ruby .github/workflows/github_actions_info.rb
 
-      # fixes 'has a bug that prevents `required_ruby_version`'
-      - name: update rubygems for Ruby 2.4 - 2.5
-        if: |
-          contains('2.4 2.5 2.6', matrix.ruby) &&
-          (needs.skip_duplicate_runs.outputs.should_skip != 'true')
-        run: gem update --system 3.3.26 --no-document
-        continue-on-error: true
-        timeout-minutes: 5
-
       - name: set WERRORFLAG
         if: ${{ needs.skip_duplicate_runs.outputs.should_skip != 'true' }}
         shell: bash

diff --git a/.github/workflows/turbo-rails.yml b/.github/workflows/turbo-rails.yml
@@ -28,6 +28,7 @@ jobs:
           - { os: ubuntu-20.04 , ruby: '2.7', rails: '6.1' }
           - { os: ubuntu-20.04 , ruby: '3.1', rails: '7.0' }
           - { os: ubuntu-20.04 , ruby: '3.2', rails: '7.0' }
+          - { os: ubuntu-22.04 , ruby: '3.3', rails: '7.0' }
           - { os: ubuntu-22.04 , ruby: head , rails: '7.0' }
     env:
       CI: true