Update ci-wheels.yml for cibuildwheel v2.16.5 (#411)

Try testing cross-compilation for `macos` `arm64` on `x86_64` , given the latest release of `cibuildwheels` [v2.16.5](https://github.com/pypa/cibuildwheel/releases/tag/v2.16.5)
SciTools · Feb 5, 2024 · 3987a80 · 3987a80
1 parent 46f5af5
commit 3987a80
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -40,8 +40,8 @@ jobs:
             version: py311
             posargs: "--cov-report=xml --cov"
             post-command: codecov
-          - version: py311
-            os: macos-latest
+          - os: macos-latest
+            version: py311
             platform: osx
     steps:
     - name: "Checkout"

diff --git a/.github/workflows/ci-wheels.yml b/.github/workflows/ci-wheels.yml
@@ -27,25 +27,28 @@ concurrency:
 jobs:
   build_bdist:
     name: "Build ${{ matrix.os }} (${{ matrix.arch }}) wheels"
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         # TBD: extend to support windows
-        os: ["ubuntu", "macos"]
-        arch: ["x86_64", "arm64"]
-        exclude:
-        - os: ubuntu
-          arch: arm64
+        os: ["ubuntu-latest", "macos-11", "macos-14"]
         include:
-        - os: ubuntu
+        - os: ubuntu-latest
+          arch: x86_64
           incdir: /usr/include/udunits2
           libdir: /usr/lib64
           xml_path: /usr/share/udunits/udunits2.xml
-        - os: macos
+        - os: macos-11
+          arch: x86_64
           incdir: /usr/local/Cellar/udunits/2.2.28/include
           libdir: /usr/local/Cellar/udunits/2.2.28/lib
           xml_path: /usr/local/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml
+        - os: macos-14
+          arch: arm64
+          incdir: /opt/homebrew/Cellar/udunits/2.2.28/include
+          libdir: /opt/homebrew/Cellar/udunits/2.2.28/lib
+          xml_path: /opt/homebrew/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml
 
     steps:
     - uses: actions/checkout@v4
@@ -61,8 +64,6 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
         CIBW_BEFORE_BUILD_LINUX: yum install -y udunits2-devel
         CIBW_BEFORE_BUILD_MACOS: brew install udunits
-        # https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
-        CIBW_TEST_SKIP: "*_arm64"
         CIBW_TEST_REQUIRES: pytest
         CIBW_TEST_COMMAND: >
           python -c 'import cf_units; print(f"cf-units v{cf_units.__version__}")' &&