Merge pull request #267 from byroot/fix-ci-matrix

Update CI matrix
rails · Oct 6, 2024 · 022433e · 022433e
2 parents d79dfbf + ea5f282
commit 022433e
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 949 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,22 +6,30 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - "3.1"
           - "3.2"
           - "3.3"
         gemfile:
           - Gemfile
           - gemfiles/rails_7_0_propshaft.gemfile
           - gemfiles/rails_7_1_propshaft.gemfile
+          - gemfiles/rails_7_2_propshaft.gemfile
           - gemfiles/rails_main_propshaft.gemfile
           - gemfiles/rails_7_0_sprockets.gemfile
           - gemfiles/rails_7_1_sprockets.gemfile
+          - gemfiles/rails_7_2_sprockets.gemfile
           - gemfiles/rails_main_sprockets.gemfile
-        continue-on-error: [ false ]
+        include:
+          - ruby-version: "3.1"
+            gemfile: gemfiles/rails_7_0_propshaft.gemfile
+          - ruby-version: "3.1"
+            gemfile: gemfiles/rails_7_1_propshaft.gemfile
+          - ruby-version: "3.1"
+            gemfile: gemfiles/rails_7_0_sprockets.gemfile
+          - ruby-version: "3.1"
+            gemfile: gemfiles/rails_7_1_sprockets.gemfile
 
     name: ${{ format('Tests (Ruby {0}, {1})', matrix.ruby-version, matrix.gemfile) }}
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.continue-on-error }}
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -203,6 +203,7 @@ PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-darwin-22

diff --git a/gemfiles/rails_7_0_propshaft.gemfile.lock b/gemfiles/rails_7_0_propshaft.gemfile.lock