Merge pull request #2060 from minrk/arm-wheels

build arm wheels on GHA arm runners
zeromq · Jan 30, 2025 · 096bb59 · 096bb59
2 parents b6d9461 + 014bc3e
commit 096bb59
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 96 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -98,6 +98,11 @@ jobs:
               arch: i686
               build: "*manylinux*"
 
+          - name: manylinux-arm
+            os: ubuntu-24.04-arm
+            cibw:
+              build: "*manylinux*"
+
           # additional manylinux variants, not specified in pyproject.toml:
           # build with newer 2_28 for cpython >= 3.10, pypy 3.9
           - name: manylinux-x86_64-2_28
@@ -110,6 +115,11 @@ jobs:
             cibw:
               build: "*musllinux*"
 
+          - name: musllinux-arm
+            os: ubuntu-24.04-arm
+            cibw:
+              build: "*musllinux*"
+
           - name: win32
             os: windows-2019
             architecture: x86
@@ -182,38 +192,6 @@ jobs:
           path: "wheelhouse/*"
           if-no-files-found: error
 
-  circle-wheels:
-    if: github.repository_owner == 'zeromq'
-    runs-on: ubuntu-22.04
-    needs:
-      # not strictly required, but avoids wasting cpu time waiting
-      - wheel
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-          cache: pip
-
-      - name: install dependencies
-        run: |
-          pip install --upgrade setuptools pip wheel
-          pip install requests
-
-      - name: fetch wheels from circleci
-        run: python3 tools/circle_wheels.py
-        env:
-          CIRCLECI_TOKEN: ${{ secrets.CIRCLECI_TOKEN }}
-          PR_HEAD_SHA: ${{ github.event.pull_request && github.event.pull_request.head.sha }}
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: wheels-linux-arm
-          path: "wheelhouse/*"
-          if-no-files-found: error
-
   github-release:
     permissions:
       contents: write
@@ -249,7 +227,6 @@ jobs:
     needs:
       - sdist
       - wheel
-      - circle-wheels
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -267,7 +244,6 @@ jobs:
     needs:
       - sdist
       - wheel
-      - circle-wheels
     steps:
       - uses: actions/download-artifact@v4
         with: