From 7d907b22a7314348a9b6b589de5d5876232770a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Baran?= <work.dusanbaran@gmail.com>
Date: Fri, 24 May 2024 15:32:39 +0200
Subject: [PATCH] [python/ci] Bump up cibuildwheel version, use macos-14, and
 use `MACOSX_DEPLOYMENT_TARGET` (#2641)

* Bump up cibuildwheel version and use macos-14

* Set MACOSX_DEPLOYMENT_TARGET

* Enable macos-arm in smoke-tests

* Update python-packaging.yml
---
 .github/workflows/python-packaging.yml | 27 ++++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/python-packaging.yml b/.github/workflows/python-packaging.yml
index a1244885a6..2906fa7df0 100644
--- a/.github/workflows/python-packaging.yml
+++ b/.github/workflows/python-packaging.yml
@@ -58,7 +58,8 @@ jobs:
             cibw_archs_macos: x86_64
             wheel-name: macos-x86_64
           - build: macosx_arm64
-            os: macos-12
+            os: macos-14
+            # ^ Note that macos-14 is arm64 only
             cibw_archs_macos: arm64
             wheel-name: macos-arm64
     steps:
@@ -69,7 +70,7 @@ jobs:
       - name: Rename sdist
         run: cp tiledbsoma-*.tar.gz tiledbsoma.tar.gz && ls -lh
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.3
+        uses: pypa/cibuildwheel@v2.18.1
         with:
           package-dir: tiledbsoma.tar.gz
           only: cp${{ matrix.python-version }}-${{ matrix.build }}
@@ -84,6 +85,7 @@ jobs:
           CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }}
           CIBW_TEST_SKIP: "*_arm64"
           CMAKE_OSX_ARCHITECTURES: ${{ matrix.cibw_archs_macos }}
+          MACOSX_DEPLOYMENT_TARGET: "11.0"
       - name: Upload wheel-${{ matrix.wheel-name }}-${{ matrix.python-version }} to GitHub Actions storage
         uses: actions/upload-artifact@v4
         with:
@@ -105,7 +107,7 @@ jobs:
         wheel-name:
           - manylinux2014
           - macos-x86_64
-          # - macos-arm64
+          - macos-arm64
         include:
           - wheel-name: manylinux2014
             os: ubuntu-20.04
@@ -117,20 +119,11 @@ jobs:
             arch: x86_64
             cc: clang
             cxx: clang++
-          # TODO: As of 2023-05-18 all we can do in GitHub Actions for MacOS arm64 is cross-compile the wheels
-          # for arm64, while actually running on x86 hardware. This means we can build the wheels but we cannot
-          # smoke-test them. This is pending MacOS arm64 runners for GitHub Actions which is tracked here:
-          #   https://github.com/github/roadmap/issues/528
-          # Any smoke-testing for arm64 wheels needs to be done manually by:
-          # * Download the whatever.zip file from GitHub Actions -> our instance -> Artifacts
-          # * unzip whatever.zip
-          # * pip install tiledbsoma-i.j.k-cp310-cp310-macosx_11_0_arm64.whl
-          #
-          # - wheel-name: macos-arm64
-          #   os: macos-12
-          #   arch: arm64
-          #   cc: clang
-          #   cxx: clang++
+          - wheel-name: macos-arm64
+            os: macos-14
+            arch: arm64
+            cc: clang
+            cxx: clang++
       fail-fast: false
     steps:
       - name: Set up Python ${{ matrix.python.vv }}