Update GH actions to fix CI builds (#1828)

* Eric's fixe from PR #1827 Signed-off-by: Darby Johnston <[email protected]> * Update dawidd6/action-download-artifact to v8 Signed-off-by: Darby Johnston <[email protected]> * Try updating pypa/cibuildwheel Signed-off-by: Darby Johnston <[email protected]> * Update setup-python Signed-off-by: Darby Johnston <[email protected]> * Try using native ARM runner Signed-off-by: Darby Johnston <[email protected]> * Use ubuntu-latest and ubuntu-24.04-arm Signed-off-by: Darby Johnston <[email protected]> * Set MACOSX_DEPLOYMENT_TARGET Signed-off-by: Darby Johnston <[email protected]> * Use default images Signed-off-by: Darby Johnston <[email protected]> * Try setting CIBW_ARCHS_LINUX to auto Signed-off-by: Darby Johnston <[email protected]> * Try setting CIBW_ARCHS_LINUX explicitly Signed-off-by: Darby Johnston <[email protected]> * Add back ticks Signed-off-by: Darby Johnston <[email protected]> * Set images explicitly Signed-off-by: Darby Johnston <[email protected]> * Try removing CIBW_ARCHS_LINUX Signed-off-by: Darby Johnston <[email protected]> * Try setting CIBW_ARCHS_LINUX to native Signed-off-by: Darby Johnston <[email protected]> * Remove old code Signed-off-by: Darby Johnston <[email protected]> --------- Signed-off-by: Darby Johnston <[email protected]>
AcademySoftwareFoundation · Feb 5, 2025 · e100920 · e100920
1 parent c2985df
commit e100920
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -17,16 +17,17 @@ jobs:
     # happen for this actual commit (the commit that the tag points to).
     # It also restores the files timestamps.
     - name: Download wheels from commit ${{ github.sha }}
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v8
       with:
         workflow: python-package.yml
         workflow_conclusion: success
         commit: ${{ github.sha }}
-        name: wheels
+        name_is_regexp: true
+        name: `wheel-.*`
         path: dist
 
     - name: Download sdist from commit ${{ github.sha }}
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v8
       with:
         workflow: python-package.yml
         workflow_conclusion: success

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -133,7 +133,7 @@ jobs:
           git
     - name: Set up Python ${{ matrix.python-version }}
       if: matrix.python-version != 'mingw64'
-      uses: actions/setup-python@v4.3.0
+      uses: actions/setup-python@v5.4.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install coverage dependency
@@ -171,31 +171,28 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
-        python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
+        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest]
+        python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312']
         exclude:
-          - { os: macos-latest, python-build: 'cp37*' }
+          - { os: macos-latest, python-build: 'cp37' }
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v3
-
       - name: Build wheels (Python 3)
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.22.0
         with:
           output-dir: wheelhouse
         env:
-          CIBW_BUILD: ${{ matrix.python-build }}
+          CIBW_BUILD: ${{ matrix.python-build }}*
           CIBW_SKIP: '*musllinux*'
-          CIBW_ARCHS_LINUX: x86_64 aarch64
+          CIBW_ARCHS_LINUX: native
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
+          MACOSX_DEPLOYMENT_TARGET: 10.14
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheel-${{ matrix.os }}-${{ matrix.python-build }}
           path: ./wheelhouse/*.whl
 
   package_sdist:
@@ -206,15 +203,15 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - uses: actions/setup-python@v4.3.0
+    - uses: actions/setup-python@v5.4.0
 
     - name: Install pypa/build
       run: python -m pip install build --user
 
     - name: Generate sdist
       run: python -m build -s .
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: sdist
         path: dist