redo build matrix with includes

rubysherpas · Jun 5, 2023 · 1f7bd7d · 1f7bd7d
1 parent 12600b8
commit 1f7bd7d
Showing 1 changed file with 58 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,49 +16,70 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        experimental:
-					- false
-        ruby:
-          - 3.1
-          - '3.0'
-          - 2.7
-          - 2.6
-          - 2.5
-          # - jruby-9.2.19.0
-          # - jruby-9.3.1.0
-        rails:
-          - '~> 5.1.0'
-          - '~> 5.2.0'
-          - '~> 6.0.0'
-          - '~> 6.1.0'
-          - '~> 7.0.0'
-          - 'edge'
         include:
           - ruby: 3.2
+            rails: 'edge'
             experimental: true
+          - ruby: jruby-9.2.19.0
+            rails: '~> 7.0.0'
+            experimental: true
+          - ruby: jruby-9.3.1.0
+            rails: '~> 7.0.0'
+            experimental: true
+          - ruby: jruby-9.2.19.0
+            rails: '~> 6.1.0'
+            experimental: true
+          - ruby: jruby-9.3.1.0
+            rails: '~> 6.1.0'
+            experimental: true
+          - ruby: 3.2
+            rails: '~> 7.0.0'
+            experimental: true
+          - ruby: 3.1
+            rails: '~> 7.0.0'
+            experimental: false
+          - ruby: 3.1
+            rails: '~> 6.1.0'
+            experimental: false
+          - ruby: '3.0'
+            rails: '~> 7.0.0'
+            experimental: false
+          - ruby: '3.0'
+            rails: '~> 6.1.0'
+            experimental: false
+          - ruby: 2.7
+            rails: '~> 7.0.0'
+            experimental: false
+          - ruby: 2.7
+            rails: '~> 6.1.0'
+            experimental: false
+          - ruby: 2.7
+            rails: '~> 6.0.0'
+            experimental: false
+          - ruby: 2.6
+            rails: '~> 6.1.0'
+            experimental: false
+          - ruby: 2.6
+            rails: '~> 6.0.0'
+            experimental: false
+          - ruby: 2.6
+            rails: '~> 5.2.0'
+            experimental: false
+          - ruby: 2.6
+            rails: '~> 5.1.0'
+            experimental: false
+          - ruby: 2.5
+            rails: '~> 6.0.0'
+            experimental: false
+          - ruby: 2.5
+            rails: '~> 5.2.0'
+            experimental: false
+          - ruby: 2.5
+            rails: '~> 5.1.0'
+            experimental: false
         #os: ubuntu-latest
         #arch: x64
 
-        exclude:
-        # Rails edge is now 7.x and requires ruby 2.7
-        - rails: 'edge'
-          ruby: 2.6
-        - rails: 'edge'
-          ruby: 2.5
-        - rails: '~> 7.0.0'
-          ruby: 2.6
-        - rails: '~> 7.0.0'
-          ruby: 2.5
-        # Legacy Rails with newer rubies
-        - rails: '~> 5.1.0'
-          ruby: '3.0'
-        - rails: '~> 5.2.0'
-          ruby: '3.0'
-        - rails: '~> 5.1.0'
-          ruby: 3.1
-        - rails: '~> 5.2.0'
-          ruby: 3.1
-
     env:
       RAILS: ${{ matrix.rails }}
     steps: