From 1f7bd7d978e5fd7d3b942a9a8c1a1f0ce483d36d Mon Sep 17 00:00:00 2001
From: Mathieu Jobin <mathieu@justbudget.com>
Date: Wed, 16 Nov 2022 08:27:59 +0900
Subject: [PATCH] redo build matrix with includes

---
 .github/workflows/build.yml | 95 ++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 163c0677..e90e5d11 100644
--- 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: