ci: fix macos and aarch64 builds

onecommons · Oct 4, 2024 · cb94b55 · cb94b55
1 parent 514ba01
commit cb94b55
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
@@ -346,18 +346,18 @@ jobs:
     - name: install python dependencies
       run: pip install -U setuptools wheel twine cibuildwheel pbr
 
+    - name: Set up QEMU
+      if: matrix.os == 'ubuntu'
+      uses: docker/setup-qemu-action@v3
+      with:
+         platforms: all
+
     - name: build sdist
       if: matrix.os == 'ubuntu' && matrix.python-version == '8'
       run: |
         pip install -U setuptools-rust
         python setup.py sdist
 
-    - name: Set up QEMU
-      if: matrix.os == 'ubuntu'
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: all
-
     - name: build ${{ matrix.platform || matrix.os }} binaries
       run: cibuildwheel --output-dir dist
       env:
@@ -372,13 +372,13 @@ jobs:
         # CIBW_TEST_SKIP: '*-macosx_arm64'
         # CIBW_TEST_REQUIRES: pytest
         # CIBW_TEST_COMMAND: 'pytest {project}/tests -s'
-        CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH"'
+        CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" MACOSX_DEPLOYMENT_TARGET=10.12'
         CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
         CIBW_ARCHS_MACOS: "universal2"
         CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
-        CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
+        CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64:latest
         CIBW_MUSLLINUX_AARCH64_IMAGE: musllinux_1_1
         CIBW_BEFORE_BUILD: rustup show
         CIBW_BEFORE_BUILD_LINUX: >