Skip to content

Commit 4a52c05

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents cca4f85 + 408a367 commit 4a52c05

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
python-version: ["3.11", "3.12", "3.13", "3.14"]
16-
# macos-13 is an intel runner, macos-14 is an arm64 runner
17-
platform: [ubuntu-latest, ubuntu-22.04-arm, windows-latest, macos-13, macos-14]
16+
# macos-15-large is an intel runner, macos-14 is an arm64 runner
17+
platform: [ubuntu-latest, ubuntu-22.04-arm, windows-latest, macos-15-large, macos-14]
1818

1919
defaults:
2020
run:
@@ -38,7 +38,7 @@ jobs:
3838
run: conda install -y c-compiler cxx-compiler
3939

4040
- name: Install clang
41-
if: matrix.platform == 'macos-13'
41+
if: matrix.platform == 'macos-15-large'
4242
run: conda install -y 'clang>=12.0.1,<17'
4343

4444
- name: Show conda environment info

.github/workflows/wheel.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
# macos-13 is an intel runner, macos-14 is an arm64 runner
23-
os: [ubuntu-latest, ubuntu-22.04-arm, windows-latest, macos-13, macos-14]
22+
# macos-15-large is an intel runner, macos-14 is an arm64 runner
23+
os: [ubuntu-latest, ubuntu-22.04-arm, windows-latest, macos-15-large, macos-14]
2424
env:
2525
CIBW_TEST_COMMAND: python -c "import numcodecs"
2626
CIBW_BUILD: "cp311-* cp312-* cp313-* cp314-*"

0 commit comments

Comments
 (0)