Skip to content

Commit

Permalink
stop using github runner image macos-12, it's to be removed soon
Browse files Browse the repository at this point in the history
not sure if will still affect macOS 11, as it was in #297
  • Loading branch information
wojdyr committed Nov 26, 2024
1 parent af0acf7 commit b51e2bb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheels2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit b51e2bb

Please sign in to comment.