From 0f98dc087bf864334b9ca2c1242f8a40c916cfd0 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Sat, 17 Sep 2022 03:04:56 +0200
Subject: [PATCH] Add arm64 mac and linux wheels

---
 .github/workflows/install-postgres.sh |  9 ++++--
 .github/workflows/release.yml         | 40 +++++++++++++++++++--------
 tests/test_introspection.py           |  2 +-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/install-postgres.sh b/.github/workflows/install-postgres.sh
index c3f27186..4ffbb4d6 100755
--- a/.github/workflows/install-postgres.sh
+++ b/.github/workflows/install-postgres.sh
@@ -27,11 +27,16 @@ if [ "${ID}" = "debian" -o "${ID}" = "ubuntu" ]; then
     apt-get install -y --no-install-recommends \
         "postgresql-${PGVERSION}" \
         "postgresql-contrib-${PGVERSION}"
+elif [ "${ID}" = "almalinux" ]; then
+    yum install -y \
+        "postgresql-server" \
+        "postgresql-devel" \
+        "postgresql-contrib"
 elif [ "${ID}" = "centos" ]; then
-    el="EL-${VERSION_ID}-$(arch)"
+    el="EL-${VERSION_ID%.*}-$(arch)"
     baseurl="https://download.postgresql.org/pub/repos/yum/reporpms"
     yum install -y "${baseurl}/${el}/pgdg-redhat-repo-latest.noarch.rpm"
-    if [ ${VERSION_ID} -ge 8 ]; then
+    if [ ${VERSION_ID%.*} -ge 8 ]; then
         dnf -qy module disable postgresql
     fi
     yum install -y \
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e984a351..40f233f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -71,16 +71,25 @@ jobs:
   build-wheels:
     needs: validate-release-request
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        cibw_python: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"]
-        cibw_arch: ["auto64", "auto32"]
-        exclude:
-          - os: macos-latest
-            cibw_arch: "auto32"
-          - os: ubuntu-latest
-            cibw_arch: "auto32"
+        include:
+          - {os: macos-latest, arch: x86_64, build: "*"}
+          - {os: macos-latest, arch: arm64, build: "*"}
+          - {os: windows-latest, arch: AMD64, build: "*"}
+          - {os: windows-latest, arch: x86, build: "*"}
+          - {os: ubuntu-latest, arch: x86_64, build: "*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[61]-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[72]-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[83]-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[94]-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[05]-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[61]-musllinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[72]-musllinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[83]-musllinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[94]-musllinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*[05]-musllinux*"}
 
     defaults:
       run:
@@ -94,12 +103,19 @@ jobs:
       with:
         fetch-depth: 50
         submodules: true
+        
+    - name: Set up QEMU
+      if: runner.os == 'Linux'
+      uses: docker/setup-qemu-action@v2
 
-    - uses: pypa/cibuildwheel@v2.8.0
+    - uses: pypa/cibuildwheel@v2.10.0
       env:
         CIBW_BUILD_VERBOSITY: 1
-        CIBW_BUILD: ${{ matrix.cibw_python }}
-        CIBW_ARCHS: ${{ matrix.cibw_arch }}
+        CIBW_ARCHS: ${{ matrix.arch }}
+        CIBW_BUILD: ${{ matrix.build }}  # py versions from setup.py -> python_requires
+        CIBW_SKIP: pp*
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+        CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
 
     - uses: actions/upload-artifact@v2
       with:
@@ -107,7 +123,7 @@ jobs:
         path: wheelhouse/*.whl
 
   publish-docs:
-    needs: validate-release-request
+    needs: [build-sdist, build-wheels]
     runs-on: ubuntu-latest
 
     env:
diff --git a/tests/test_introspection.py b/tests/test_introspection.py
index 56f1d7a3..78561dd0 100644
--- a/tests/test_introspection.py
+++ b/tests/test_introspection.py
@@ -12,7 +12,7 @@
 from asyncpg import connection as apg_con
 
 
-MAX_RUNTIME = 0.1
+MAX_RUNTIME = 0.25
 
 
 class SlowIntrospectionConnection(apg_con.Connection):