Merge pull request #3222 from offbyone/test-on-macos

getpelican · Oct 28, 2023 · 84795c7 · 84795c7
2 parents 3dce25a + 19c797a
commit 84795c7
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,33 +9,25 @@ env:
 
 jobs:
   test:
-    name: Test - ${{ matrix.config.python }} - ${{ matrix.config.os }}
-    runs-on: ${{ matrix.config.os }}-latest
+    name: Test - ${{ matrix.python }} - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}-latest
 
     strategy:
       matrix:
-        config:
+        os: [ubuntu, macos, windows]
+        python: ["3.10", "3.11", "3.12"]
+        include:
           - os: ubuntu
             python: "3.8"
           - os: ubuntu
             python: "3.9"
-          - os: ubuntu
-            python: "3.10"
-          - os: ubuntu
-            python: "3.11"
-          - os: ubuntu
-            python: "3.12"
-          - os: macos
-            python: "3.10"
-          - os: windows
-            python: "3.10"
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.config.python }}
+      - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.config.python }}
+          python-version: ${{ matrix.python }}
           cache: "pip"
           cache-dependency-path: "**/requirements/*"
       - name: Install locale (Linux)
@@ -54,7 +46,7 @@ jobs:
           echo "=====  PANDOC  ====="
           pandoc --version | head -2
       - name: Run tests
-        run: tox -e py${{ matrix.config.python }}
+        run: tox -e py${{ matrix.python }}
 
   lint:
     name: Lint