CI: Rearrange the build matrix

mrkn · Dec 27, 2022 · 95d70ed · 95d70ed
1 parent f7cde02
commit 95d70ed
Showing 1 changed file with 44 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,35 +21,58 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - ubuntu-latest
         - ubuntu-20.04
         - macos-latest
         ruby:
+        - "3.2"
+        - "3.1"
         - "3.0"
-        - 2.7
-        - 2.6
+        - "2.7"
         python:
-        - 3.x
-        - 2.x
+        - "3.x"
         python_architecture:
         - x64
         venv:
         - ""
         include:
-        - { os: ubuntu-20.04   , ruby: 2.5   , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.4   , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.5   , python: 2.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.4   , python: 2.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.8 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.7 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.6 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-18.04   , ruby: 2.7   , python: 3.8 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: debug , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.0" , python: 3.8 , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.0" , python: 3.8 , python_architecture: x64 , venv: "venv:"  }
-        #- { os: macos-latest   , ruby: debug , python: 3.x , python_architecture: x64 , venv: "" }
+        # Old ruby and the latest Python 3
+        - { os: ubuntu-20.04   , ruby: 2.6   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.5   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.4   , python: "3.x"  , python_architecture: x64 , venv: "" }
+
+        # The latest Python 2
+        - { os: ubuntu-20.04   , ruby: 3.1   , python: "2.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 3.0   , python: "2.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "2.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.6   , python: "2.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.5   , python: "2.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.4   , python: "2.x"  , python_architecture: x64 , venv: "" }
+
+        # Ruby 2.7 with Each Python 3.x
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.11" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.10" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.9"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.8"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.7"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.6"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-18.04   , ruby: 2.7   , python: "3.8"  , python_architecture: x64 , venv: "" }
+
+        # Ruby-debug with the latest Python 3
+        - { os: ubuntu-20.04   , ruby: debug , python: "3.x"  , python_architecture: x64 , venv: "" }
+
+        # Ruby 3.1 with the latest Python 3 with venv
+        - { os: ubuntu-20.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
+        - { os: ubuntu-18.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
+
+        # Ubuntu 18.04 with venv
+        - { os: ubuntu-18.04   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
+
+        # macOS with venv
+        - { os: macos-latest   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
+        - { os: macos-latest   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
+
+        #- { os: macos-latest   , ruby: debug , python: "3.x" , python_architecture: x64 , venv: "" }
 
     steps:
     - uses: actions/checkout@v2
@@ -98,9 +121,9 @@ jobs:
         - ubuntu-20.04
         - macos-latest
         ruby:
-        - "3.0"
+        - "3.1"
         python:
-        - 3.8
+        - 3.10
 
     steps:
     - uses: actions/checkout@v2