Merge Pythons into fewer runners, tweak conda-remove-defaults since i…

…t's not working - should it not be a string?
chrisjbillington · Nov 28, 2024 · 186f44e · 186f44e
1 parent 9d21c67
commit 186f44e
Showing 1 changed file with 7 additions and 29 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -21,32 +21,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - { os: ubuntu-latest,   python: '3.13',  arch: x64 }
-          - { os: ubuntu-latest,   python: '3.12',  arch: x64 }
-          - { os: ubuntu-latest,   python: '3.11',  arch: x64 }
-          - { os: ubuntu-latest,   python: '3.10',  arch: x64 }
-          - { os: ubuntu-latest,   python: '3.9',  arch: x64 }
-          - { os: ubuntu-latest,   python: '3.8',  arch: x64 }
-
-          - { os: macos-13,        python: '3.13',  arch: x64 }
-          - { os: macos-13,        python: '3.12',  arch: x64 }
-          - { os: macos-13,        python: '3.11',  arch: x64 }
-          - { os: macos-13,        python: '3.10',  arch: x64 }
-          - { os: macos-13,        python: '3.9',  arch: x64 }
-          - { os: macos-13,        python: '3.8',  arch: x64 }
-
-          - { os: macos-latest,    python: '3.13',  arch: arm64 }
-          - { os: macos-latest,    python: '3.12',  arch: arm64 }
-          - { os: macos-latest,    python: '3.11',  arch: arm64 }
-          - { os: macos-latest,    python: '3.10',  arch: arm64 }
-          - { os: macos-latest,    python: '3.9',  arch: arm64 }
-
-          - { os: windows-latest,  python: '3.13',  arch: x64 }
-          - { os: windows-latest,  python: '3.12',  arch: x64 }
-          - { os: windows-latest,  python: '3.11',  arch: x64 }
-          - { os: windows-latest,  python: '3.10',  arch: x64 }
-          - { os: windows-latest,  python: '3.9',  arch: x64 }
-          - { os: windows-latest,  python: '3.8',  arch: x64 }
+          - { os: ubuntu-latest,   pythons: '3.13,3.12,3.11,3.10,3.9,3.8',  arch: x64 }
+          - { os: windows-latest,  pythons: '3.13,3.12,3.11,3.10,3.9,3.8',  arch: x64 }
+          - { os: macos-13,        pythons: '3.13,3.12,3.11,3.10,3.9,3.8',  arch: x64 }
+          - { os: macos-latest,    pythons: '3.13,3.12,3.11,3.10,3.9,3.8',  arch: arm64 }
 
     if: github.repository == 'chrisjbillington/setuptools-conda' && (github.event_name != 'create' || github.event.ref_type != 'branch')
     steps:
@@ -65,20 +43,20 @@ jobs:
           auto-update-conda: true
           architecture: ${{ matrix.arch }}
           miniforge-version: "latest"
+          conda-remove-defaults: true
           channels: conda-forge
-          conda-remove-defaults: "true"
           auto-activate-base: true
           activate-environment: ""
 
       - name: Conda package (Unix)
         if: runner.os != 'Windows'
         shell: bash -l {0}
-        run: python -m setuptools_conda --pythons=${{ matrix.python }} build .
+        run: python -m setuptools_conda --pythons=${{ matrix.pythons }} build .
 
       - name: Conda Package (Windows)
         if: runner.os == 'Windows'
         shell: cmd /C CALL {0}
-        run: python -m setuptools_conda --pythons=${{ matrix.python }} build .
+        run: python -m setuptools_conda --pythons=${{ matrix.pythons }} build .
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3