Update github build-script

Issues with macos-14 arm builds
drlukeparry · Jul 24, 2024 · cf22103 · cf22103
1 parent 33c95d3
commit cf22103
Showing 1 changed file with 28 additions and 8 deletions.
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -12,16 +12,25 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
-        os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
+        os: [ubuntu-latest, macos-14, macos-13, windows-latest]
         exclude:
         - os: ubuntu-latest
           python-version: '3.12'
+        - os: macos-14
+          python-version: 3.7
+        - os: macos-14
+          python-version: 3.8
+        - os: macos-14
+          python-version: 3.9
+        - os: macos-14
+          python-version: '3.10'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version}}
     - name: Display Python version
@@ -35,8 +44,12 @@ jobs:
       run: |
         sudo apt-get update -qq -y
         sudo apt-get install -qq -y libglu1-mesa libspatialindex6 build-essential
-    - name: Install Brew On Mac
-      if: matrix.os == 'macos-latest'
+    - name: Install Brew On Mac-13
+      if: matrix.os == 'macos-13'
+      run: |
+        brew install geos
+    - name: Install Brew On Mac-14
+      if: matrix.os == 'macos-14'
       run: |
         brew install geos
     - name: Install dependencies
@@ -57,11 +70,18 @@ jobs:
       run: |
         twine upload dist/*
         
-    - name: Publish (Mac OS)
+    - name: Publish (Mac OS-13)
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      if: matrix.os == 'macos-latest'
+      if: matrix.os == 'macos-13'
       run: |
         python3 -m twine upload dist/*    
-    
+
+    - name: Publish (Mac OS-14)
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      if: matrix.os == 'macos-14'
+      run: |
+        python3 -m twine upload dist/*