Harmonizing ubuntu versions, aligning inactive wheels push workflow

merschformann · Jan 30, 2025 · fb910f0 · fb910f0
1 parent 477a9a6
commit fb910f0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
@@ -75,7 +75,7 @@ jobs:
           python -m pytest 
              
   build_wheel_linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
         matrix:
           python: [3.11]

diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
@@ -43,12 +43,12 @@ jobs:
         # Github Actions doesn't support pairing matrix values together, let's improvise
         # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
         buildplat:
-          - [ubuntu-20.04, manylinux_x86_64]
-          - [ubuntu-20.04, manylinux_i686]
-          - [ubuntu-20.04, manylinux_aarch64]
-          - [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
-          - [ubuntu-20.04, musllinux_i686]
-          - [ubuntu-20.04, musllinux_aarch64]
+          - [ubuntu-24.04, manylinux_x86_64]
+          - [ubuntu-24.04, manylinux_i686]
+          - [ubuntu-24.04-arm, manylinux_aarch64]
+          - [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
+          - [ubuntu-24.04, musllinux_i686]
+          - [ubuntu-24.04-arm, musllinux_aarch64]
           - [macos-13, macosx_x86_64]
           - [macos-14, macosx_arm64]
           - [windows-2019, win_amd64]
@@ -58,21 +58,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up QEMU # Required for aarch64 builds
-        if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Build wheels (aarch64)
-        if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
-        uses: pypa/[email protected]
-        env:
-          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
-          CIBW_ARCHS_LINUX: aarch64
-
-      - name: Build wheels (not aarch64)
-        if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
+      - name: Build wheels
         uses: pypa/[email protected]
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -32,11 +32,11 @@ jobs:
         # Github Actions doesn't support pairing matrix values together, let's improvise
         # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
         buildplat:
-          - [ubuntu-20.04, manylinux_x86_64]
-          - [ubuntu-20.04, manylinux_i686]
+          - [ubuntu-24.04, manylinux_x86_64]
+          - [ubuntu-24.04, manylinux_i686]
           - [ubuntu-24.04-arm, manylinux_aarch64]
-          - [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
-          - [ubuntu-20.04, musllinux_i686]
+          - [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
+          - [ubuntu-24.04, musllinux_i686]
           - [ubuntu-24.04-arm, musllinux_aarch64]
           - [macos-13, macosx_x86_64]
           - [macos-14, macosx_arm64]