Test build x64 on arm64 macos runner

laggykiller · Feb 28, 2024 · e38b88e · e38b88e
1 parent 885495f
commit e38b88e
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 132 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,37 +2,37 @@ name: Build and upload to PyPI
 
 on:
   push:
-    tags:
-        - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-  release:
-    types:
-      - published
+  #   tags:
+  #       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+  # release:
+  #   types:
+  #     - published
 
 jobs:
-  build_sdist:
-    name: Build source distribution
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
+  # build_sdist:
+  #   name: Build source distribution
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         submodules: recursive
 
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
+  #     - uses: actions/setup-python@v4
+  #       with:
+  #         python-version: 3.8
 
-      - name: Build sdist
-        run: pipx run build --sdist
+  #     - name: Build sdist
+  #       run: pipx run build --sdist
 
-      - name: Test sdist
-        run: |
-          python -m pip install dist/apngasm_python-*.tar.gz
-          pip install pytest Pillow numpy &&
-          pytest
+  #     - name: Test sdist
+  #       run: |
+  #         python -m pip install dist/apngasm_python-*.tar.gz
+  #         pip install pytest Pillow numpy &&
+  #         pytest
 
-      - uses: actions/upload-artifact@v3
-        with:
-          path: dist/apngasm_python-*.tar.gz
+  #     - uses: actions/upload-artifact@v3
+  #       with:
+  #         path: dist/apngasm_python-*.tar.gz
 
   build_wheels:
     name: Build wheels for ${{ matrix.os }} ${{ matrix.cibw_archs }} ${{ matrix.cibw_build }}
@@ -41,63 +41,63 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-2019
-            cibw_archs: AMD64
-            cibw_build: "*"
-            cibw_environment: APNGASM_COMPILE_TARGET=x86_64
-          - os: windows-2019
-            cibw_archs: x86
-            cibw_build: "*"
-            cibw_environment: APNGASM_COMPILE_TARGET=x86
-          - os: windows-2019
-            cibw_archs: ARM64
-            cibw_build: "*"
-            cibw_environment: APNGASM_COMPILE_TARGET=armv8
-          - os: macos-12
+          # - os: windows-2019
+          #   cibw_archs: AMD64
+          #   cibw_build: "*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=x86_64
+          # - os: windows-2019
+          #   cibw_archs: x86
+          #   cibw_build: "*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=x86
+          # - os: windows-2019
+          #   cibw_archs: ARM64
+          #   cibw_build: "*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=armv8
+          - os: macos-14
             cibw_archs: x86_64
             cibw_build: "*"
             cibw_environment: >
               APNGASM_COMPILE_TARGET=x86_64
-              _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64
-              MACOSX_DEPLOYMENT_TARGET=10.15
-          - os: macos-14
-            cibw_archs: arm64
-            cibw_build: "*"
-            cibw_environment: >
-              APNGASM_COMPILE_TARGET=armv8
-              _PYTHON_HOST_PLATFORM=macosx-11.0-arm64
+              _PYTHON_HOST_PLATFORM=macosx-11.0-x86_64
               MACOSX_DEPLOYMENT_TARGET=11.0
+          # - os: macos-14
+          #   cibw_archs: arm64
+          #   cibw_build: "*"
+          #   cibw_environment: >
+          #     APNGASM_COMPILE_TARGET=armv8
+          #     _PYTHON_HOST_PLATFORM=macosx-11.0-arm64
+          #     MACOSX_DEPLOYMENT_TARGET=11.0
           - os: macos-14
             cibw_archs: universal2
             cibw_build: "*"
             cibw_environment: >
               APNGASM_COMPILE_TARGET=universal2
-              _PYTHON_HOST_PLATFORM=macosx-10.15-universal2
-              MACOSX_DEPLOYMENT_TARGET=10.15
-          - os: ubuntu-20.04
-            cibw_archs: x86_64
-            cibw_build: "*"
-            cibw_environment: APNGASM_COMPILE_TARGET=x86_64
-          - os: ubuntu-20.04
-            cibw_archs: i686
-            cibw_build: "*"
-            cibw_environment: APNGASM_COMPILE_TARGET=x86
-          - os: ubuntu-20.04
-            cibw_archs: aarch64
-            cibw_build: "*-musllinux_*"
-            cibw_environment: APNGASM_COMPILE_TARGET=armv8
-          - os: ubuntu-20.04
-            cibw_archs: aarch64
-            cibw_build: "*-manylinux_*"
-            cibw_environment: APNGASM_COMPILE_TARGET=armv8
-          - os: ubuntu-20.04
-            cibw_archs: ppc64le
-            cibw_build: "*-musllinux_*"
-            cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
-          - os: ubuntu-20.04
-            cibw_archs: ppc64le
-            cibw_build: "*-manylinux_*"
-            cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
+              _PYTHON_HOST_PLATFORM=macosx-11.0-universal2
+              MACOSX_DEPLOYMENT_TARGET=11.0
+          # - os: ubuntu-20.04
+          #   cibw_archs: x86_64
+          #   cibw_build: "*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=x86_64
+          # - os: ubuntu-20.04
+          #   cibw_archs: i686
+          #   cibw_build: "*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=x86
+          # - os: ubuntu-20.04
+          #   cibw_archs: aarch64
+          #   cibw_build: "*-musllinux_*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=armv8
+          # - os: ubuntu-20.04
+          #   cibw_archs: aarch64
+          #   cibw_build: "*-manylinux_*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=armv8
+          # - os: ubuntu-20.04
+          #   cibw_archs: ppc64le
+          #   cibw_build: "*-musllinux_*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
+          # - os: ubuntu-20.04
+          #   cibw_archs: ppc64le
+          #   cibw_build: "*-manylinux_*"
+          #   cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
           # - os: ubuntu-20.04
           #   cibw_archs: s390x
           #   cibw_build: "*-musllinux_*"

diff --git a/.github/workflows/check_and_fix.yml b/.github/workflows/check_and_fix.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ elseif (APPLE)
     if(${APNGASM_COMPILE_TARGET} STREQUAL "armv8")
         set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
     else()
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
     endif()
 endif()
 

diff --git a/scripts/get_deps.py b/scripts/get_deps.py
@@ -21,7 +21,7 @@ def install_deps(arch: str):
         if arch == "armv8":
             settings.append("os.version=11.0")
         else:
-            settings.append("os.version=10.15")
+            settings.append("os.version=11.0")
         settings.append("compiler=apple-clang")
         settings.append("compiler.libcxx=libc++")
     elif platform.system() == "Linux":