From 924b49969f88f0b69035d852b5ad2d1a3b77bc9d Mon Sep 17 00:00:00 2001
From: Gautham <ahgamut@gmail.com>
Date: Tue, 27 Aug 2024 07:08:47 -0500
Subject: [PATCH] wheels for x86_64 and aarch64

musllinux is skipped for now
---
 .../{wheels.yml => aarch64-wheels.yml}        | 13 ++++---
 .github/workflows/x86_64-wheels.yml           | 38 +++++++++++++++++++
 2 files changed, 45 insertions(+), 6 deletions(-)
 rename .github/workflows/{wheels.yml => aarch64-wheels.yml} (72%)
 create mode 100644 .github/workflows/x86_64-wheels.yml

diff --git a/.github/workflows/wheels.yml b/.github/workflows/aarch64-wheels.yml
similarity index 72%
rename from .github/workflows/wheels.yml
rename to .github/workflows/aarch64-wheels.yml
index f237f46..1501328 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/aarch64-wheels.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
+        os: [ ubuntu-latest, windows-latest, macos-14 ] # macos-14 is apple silicon
     runs-on: ${{ matrix.os }}
     name: build and test wheels on ${{ matrix.os }}
     steps:
@@ -27,18 +27,19 @@ jobs:
         uses: pypa/cibuildwheel@v2.20.0
         env:
           CIBW_PRERELEASE_PYTHONS: False
-          CIBW_SKIP: "cp36* cp313-* pp*"
+          CIBW_SKIP: "cp36* cp313-* pp* *musllinux*"
           CIBW_BUILD_FRONTEND: "build"
           CIBW_BEFORE_BUILD: pip install numpy>=1.14 pybind11>=2.2
           CIBW_TEST_REQUIRES: "pytest"
           CIBW_TEST_COMMAND: "pytest -v {project}"
-          CIBW_ARCHS_LINUX: "x86_64 aarch64"
-          CIBW_ARCHS_MACOS: "x86_64 arm64"
-          CIBW_ARCHS_WINDOWS: "AMD64"
+          CIBW_TEST_SKIP: "*-win_arm64"
+          CIBW_ARCHS_LINUX: "aarch64"
+          CIBW_ARCHS_MACOS: "arm64"
+          CIBW_ARCHS_WINDOWS: "ARM64"
 
       - name: upload wheel artifacts temporarily
         uses: actions/upload-artifact@v4
         with:
-          name: cliquematch-wheels-${{ matrix.os }}
+          name: cliquematch-wheels-aarch64-${{ matrix.os }}
           path: ./wheelhouse/*.whl
           retention-days: 1
diff --git a/.github/workflows/x86_64-wheels.yml b/.github/workflows/x86_64-wheels.yml
new file mode 100644
index 0000000..370abcc
--- /dev/null
+++ b/.github/workflows/x86_64-wheels.yml
@@ -0,0 +1,38 @@
+name: Build and test all wheels
+on:
+  push:
+    branches:
+      master
+
+jobs:
+  build_wheels:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-13 ]
+    runs-on: ${{ matrix.os }}
+    name: build and test wheels on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.20.0
+        env:
+          CIBW_PRERELEASE_PYTHONS: False
+          CIBW_SKIP: "cp36* cp313-* pp* *musllinux*"
+          CIBW_BUILD_FRONTEND: "build"
+          CIBW_BEFORE_BUILD: pip install numpy>=1.14 pybind11>=2.2
+          CIBW_TEST_REQUIRES: "pytest"
+          CIBW_TEST_COMMAND: "pytest -v {project}"
+          CIBW_ARCHS_LINUX: "x86_64"
+          CIBW_ARCHS_MACOS: "x86_64"
+          CIBW_ARCHS_WINDOWS: "AMD64"
+
+      - name: upload wheel artifacts temporarily
+        uses: actions/upload-artifact@v4
+        with:
+          name: cliquematch-wheels-x86_64-${{ matrix.os }}
+          path: ./wheelhouse/*.whl
+          retention-days: 1