From f56d2ce3f27931469114f1ef5b9623360c475f00 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 18 Feb 2025 05:01:17 +1000 Subject: [PATCH] Update macOS build versions Update the versions of macOS that is used to build the wheels in CI. Also removes invalid DNF 5 option now that it is being tested in CI. Signed-off-by: Jordan Borean --- .github/workflows/ci.yml | 28 +++++++++++++--------------- ci/lib.sh | 4 ++-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c4fd5bf..ef63ae23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,29 +43,29 @@ jobs: fail-fast: false matrix: include: - - os: macOS-12 + - os: macOS-13 version: cp313-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp313-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp312-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp312-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp311-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp311-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp310-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp310-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp39-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp39-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp38-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp38-macosx_arm64 - os: windows-2022 @@ -123,10 +123,8 @@ jobs: rm gssapi-*.tar.gz - name: Build wheel - uses: pypa/cibuildwheel@v2.21.2 + uses: pypa/cibuildwheel@v2.22.0 env: - CIBW_ARCHS: all - CIBW_TEST_SKIP: '*_arm64' CIBW_BUILD: ${{ matrix.version }} CIBW_BUILD_VERBOSITY: 1 diff --git a/ci/lib.sh b/ci/lib.sh index 338434d7..a8d29852 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -23,8 +23,8 @@ lib::setup::debian_install() { } lib::setup::rh_dnfinst() { - # dnf has no update-only verb. Also: modularity just makes this slower. - dnf -y --nogpgcheck --disablerepo=\*modul\* install $@ + # dnf has no update-only verb. + dnf -y --nogpgcheck install $@ } lib::setup::centos_install() {