From 0fd35baee643f16e5a41a8970a2d4ddcb2f16011 Mon Sep 17 00:00:00 2001
From: ZipFile <zipfile.d@protonmail.com>
Date: Thu, 16 Jan 2025 19:13:11 +0000
Subject: [PATCH 1/2] Use ubuntu-24.04 GHA image

---
 .github/workflows/publishing.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
index 5e671f89..21f80009 100644
--- a/.github/workflows/publishing.yml
+++ b/.github/workflows/publishing.yml
@@ -10,7 +10,7 @@ jobs:
 
   tests:
     name: Run tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -23,7 +23,7 @@ jobs:
 
   linters:
     name: Run linters
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         toxenv: [flake8, pydocstyle, mypy, pylint]
@@ -40,7 +40,7 @@ jobs:
   build-sdist:
     name: Build source tarball
     needs: [tests, linters]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -60,7 +60,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2019, macos-14]
+        os: [ubuntu-24.04, windows-2019, macos-14]
     env:
       CIBW_SKIP: cp27-*
     steps:
@@ -73,9 +73,9 @@ jobs:
           path: ./wheelhouse/*.whl
 
   build-wheels-linux-aarch64:
-    name: Build wheels (ubuntu-22.04-aarch64)
+    name: Build wheels (ubuntu-24.04-aarch64)
     needs: [tests, linters]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       CIBW_SKIP: cp27-*
     steps:
@@ -95,7 +95,7 @@ jobs:
   publish:
     name: Publish on PyPI
     needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -113,7 +113,7 @@ jobs:
   publish-docs:
     name: Publish docs
     needs: [publish]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

From 3893e1df818cee9f0db98b8a5916bd1ca266c398 Mon Sep 17 00:00:00 2001
From: ZipFile <zipfile.d@protonmail.com>
Date: Thu, 16 Jan 2025 19:15:33 +0000
Subject: [PATCH 2/2] Use native GHA ubuntu-24.04-arm image for building wheels

---
 .github/workflows/publishing.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
index 21f80009..f3bf1529 100644
--- a/.github/workflows/publishing.yml
+++ b/.github/workflows/publishing.yml
@@ -60,7 +60,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, windows-2019, macos-14]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-14]
     env:
       CIBW_SKIP: cp27-*
     steps:
@@ -72,29 +72,9 @@ jobs:
           name: cibw-wheels-x86-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
-  build-wheels-linux-aarch64:
-    name: Build wheels (ubuntu-24.04-aarch64)
-    needs: [tests, linters]
-    runs-on: ubuntu-24.04
-    env:
-      CIBW_SKIP: cp27-*
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up QEMU
-        if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v2
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
-        env:
-          CIBW_ARCHS_LINUX: aarch64
-      - uses: actions/upload-artifact@v4
-        with:
-          name: cibw-wheels-arm-${{ matrix.os }}-${{ strategy.job-index }}
-          path: ./wheelhouse/*.whl
-
   publish:
     name: Publish on PyPI
-    needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
+    needs: [build-sdist, build-wheels]
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/download-artifact@v4