From b2a043d08b1488363a016dc1976e60d3c8dc70f5 Mon Sep 17 00:00:00 2001
From: Siddharth Chandrasekaran <sidcha.dev@gmail.com>
Date: Wed, 14 Feb 2024 01:09:07 +0100
Subject: [PATCH] CI: Update python publishing to multilinux

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>
---
 .github/workflows/publish-pypi.yml | 65 +++++++++++++++++++++---------
 utils                              |  2 +-
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
index d4f645af..5e55c432 100644
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -13,31 +13,60 @@ on:
     - 'v*' # Push events to matching Python-v*, i.e. v2.4.0
 
 jobs:
-  pypi-publish:
-    name: Upload release to PyPI
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        # windows-2022 -- currently not supported
+        os: [ubuntu-22.04, macos-13, macos-14]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.16.5
+        with:
+          package-dir: python/
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
     runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/<your-pypi-project-name>
-    permissions:
-      id-token: write # Trusted Publishing is setup for this workflow file
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Install pypa/build
-        run: |
-          python3 -m pip install build --user
-      - name: Build a binary wheel and a source tarball
+      - name: Build sdist
         run: |
           pushd python
-          python3 -m build
-      - name: Store the distribution packages
-        uses: actions/upload-artifact@v3
+          pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: python/dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
         with:
-          name: python-package-distributions
-          path: python/dist/
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: python/dist
+          merge-multiple: true
+
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
diff --git a/utils b/utils
index 65c4c01d..844307f6 160000
--- a/utils
+++ b/utils
@@ -1 +1 @@
-Subproject commit 65c4c01dd40bb4c7b313bd80dee3b7cc2d1eb7c4
+Subproject commit 844307f6b5aa3a8cb9d59809ffe23c5300631049