diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78249584..c97a04ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: CI on: [push, pull_request] jobs: - macos14: - name: "macOS 14" - runs-on: macos-14 + macos15: + name: "macOS 15" + runs-on: macos-15 if: "!contains(github.event.head_commit.message, '[skip ci]')" env: SKBUILD_CMAKE_ARGS: "-DEXTRA_WARNINGS=ON;-DFETCH_ZLIB_NG=ON" @@ -31,14 +31,14 @@ jobs: (cd docs && sphinx-build -M doctest . _build -n -E) - uses: actions/upload-artifact@v4 with: - name: gemmi-macos14 + name: gemmi-macos15 path: | ./gemmi-*.whl retention-days: 14 - macos12: - name: "macOS 12 (w/o python)" - runs-on: macos-12 + macos13: + name: "macOS 13 (w/o python)" + runs-on: macos-13 if: "!contains(github.event.head_commit.message, '[skip ci]')" steps: - uses: actions/checkout@v4 @@ -62,7 +62,7 @@ jobs: python3 tests/test_prog.py - uses: actions/upload-artifact@v4 with: - name: gemmi-macos12 + name: gemmi-macos13 path: | ${{runner.workspace}}/build/gemmi ${{runner.workspace}}/build/libgemmi* diff --git a/.github/workflows/testwheel.yml b/.github/workflows/testwheel.yml index 50767d82..f9eaa5d4 100644 --- a/.github/workflows/testwheel.yml +++ b/.github/workflows/testwheel.yml @@ -12,9 +12,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, + os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-latest, - macos-12, macos-13, macos-14] + macos-12, macos-13, macos-14, macos-15] py: ['3.8', '3.9', '3.10', '3.11', '3.12'] name: ${{ matrix.os }} py${{ matrix.py }} runs-on: ${{ matrix.os }} diff --git a/.github/workflows/wheels2.yml b/.github/workflows/wheels2.yml index 556e622f..dac92b23 100644 --- a/.github/workflows/wheels2.yml +++ b/.github/workflows/wheels2.yml @@ -24,13 +24,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, windows-2022, macos-12, macos-14] + os: [ubuntu-22.04, windows-2022, macos-13, macos-14] steps: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel@v2.22.0 env: CIBW_BUILD: ${{ github.event.inputs.cibw_build }} CIBW_SKIP: ${{ github.event.inputs.cibw_skip }}