Update manylinux to 2_28 for all arch (#192)

* Update manylinux to 2_28 for all arch * Update cibw to 2.19.2 * Update mac intel to macos12 * Set macos target compat to 12 * Test arm on macos-14 * Run on macos-12 arm64 runner * Fix runner for mac intel c libraries
Chia-Network · Jul 10, 2024 · f667a62 · f667a62
1 parent a1e84c0
commit f667a62
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/.github/workflows/build-c-libraries.yml b/.github/workflows/build-c-libraries.yml
@@ -31,7 +31,7 @@ jobs:
             matrix: macos
             runs-on:
               arm: [macOS, ARM64]
-              intel: [macos-11]
+              intel: [macos-12]
           - name: Ubuntu
             matrix: ubuntu
             runs-on:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,8 +30,8 @@ jobs:
           - name: macOS
             matrix: macos
             runs-on:
-              arm: [macOS, ARM64]
-              intel: [macos-11]
+              arm: [macos-12-arm64]
+              intel: [macos-12]
             cibw-archs-macos:
               arm: arm64
               intel: x86_64
@@ -47,33 +47,23 @@ jobs:
         python:
           - major-dot-minor: '3.8'
             cibw-build: 'cp38-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
+            manylinux: manylinux_2_28
             matrix: '3.8'
           - major-dot-minor: '3.9'
             cibw-build: 'cp39-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
+            manylinux: manylinux_2_28
             matrix: '3.9'
           - major-dot-minor: '3.10'
             cibw-build: 'cp310-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
+            manylinux: manylinux_2_28
             matrix: '3.10'
           - major-dot-minor: '3.11'
             cibw-build: 'cp311-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2014
+            manylinux: manylinux_2_28
             matrix: '3.11'
           - major-dot-minor: '3.12'
             cibw-build: 'cp312-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2014
+            manylinux: manylinux_2_28
             matrix: '3.12'
 
         arch:
@@ -115,12 +105,12 @@ jobs:
     - name: Build and test
       env:
         CIBW_BUILD: ${{ matrix.python.cibw-build }}
-        CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.python.manylinux['arm'] }}
-        CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.python.manylinux['intel'] }}
+        CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.python.manylinux }}
+        CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.python.manylinux }}
         CIBW_ARCHS_MACOS: ${{ matrix.os.cibw-archs-macos[matrix.arch.matrix] }}
         CIBW_PRERELEASE_PYTHONS: True
       run:
-        pipx run --spec='cibuildwheel==2.16.2' cibuildwheel --output-dir dist 2>&1
+        pipx run --spec='cibuildwheel==2.19.2' cibuildwheel --output-dir dist 2>&1
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ before-build = "python -m pip install --upgrade pip"
 build-verbosity = 0
 before-all = "brew install gmp boost cmake"
 before-build = "python -m pip install --upgrade pip"
-environment = {MACOSX_DEPLOYMENT_TARGET="11", SYSTEM_VERSION_COMPAT=0, BUILD_VDF_CLIENT="N"}
+environment = {MACOSX_DEPLOYMENT_TARGET="12", SYSTEM_VERSION_COMPAT=0, BUILD_VDF_CLIENT="N"}
 
 [tool.cibuildwheel.windows]
 build-verbosity = 0