Skip to content

Commit dc1f82b

Browse files
committed
build: update macos runners
Signed-off-by: Dmitry Dygalo <dmitry@dygalo.dev>
1 parent 6ac69e0 commit dc1f82b

4 files changed

Lines changed: 28 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,12 @@ jobs:
215215
fail-fast: false
216216
matrix:
217217
settings:
218-
- host: macos-13
218+
- host: macos-15
219219
target: x86_64-apple-darwin
220220
build: |
221221
yarn build
222222
strip -x *.node
223-
- host: macos-13
223+
- host: macos-15
224224
target: aarch64-apple-darwin
225225
build: |
226226
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*;
@@ -466,7 +466,7 @@ jobs:
466466
strategy:
467467
fail-fast: false
468468
matrix:
469-
os: [ubuntu-22.04, macos-13, windows-2022]
469+
os: [ubuntu-22.04, macos-15, windows-2022]
470470

471471
name: Java 17 on ${{ matrix.os }}
472472
runs-on: ${{ matrix.os }}
@@ -495,8 +495,13 @@ jobs:
495495
strategy:
496496
fail-fast: false
497497
matrix:
498-
os: [ubuntu-22.04, macos-13, windows-2022]
498+
os: [ubuntu-22.04, macos-15, windows-2022]
499499
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy-3.11"]
500+
exclude:
501+
- os: macos-15
502+
python-version: "3.9"
503+
- os: macos-15
504+
python-version: "3.10"
500505

501506
name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
502507
runs-on: ${{ matrix.os }}
@@ -505,6 +510,10 @@ jobs:
505510

506511
- uses: dtolnay/rust-toolchain@stable
507512

513+
- name: Add x86_64 target for PyPy on macOS
514+
if: matrix.os == 'macos-15' && matrix.python-version == 'pypy-3.11'
515+
run: rustup target add x86_64-apple-darwin
516+
508517
- uses: actions/setup-python@v6
509518
with:
510519
python-version: ${{ matrix.python-version }}
@@ -556,7 +565,7 @@ jobs:
556565
strategy:
557566
fail-fast: false
558567
matrix:
559-
os: [ubuntu-22.04, macos-13, windows-2022]
568+
os: [ubuntu-22.04, macos-15, windows-2022]
560569
ruby-version: ["3.2", "3.3", "3.4"]
561570

562571
name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
@@ -603,7 +612,7 @@ jobs:
603612
strategy:
604613
fail-fast: false
605614
matrix:
606-
os: [ubuntu-22.04, macos-13, windows-2022]
615+
os: [ubuntu-22.04, macos-15, windows-2022]
607616
ruby-version: ["3.2", "3.3", "3.4"]
608617

609618
steps:

.github/workflows/java-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
lib: libcss_inline.so
2727
platform: linux-x86_64
2828

29-
- os: macos-13
29+
- os: macos-15
3030
target: x86_64-apple-darwin
3131
lib: libcss_inline.dylib
3232
platform: darwin-x86_64
@@ -111,7 +111,7 @@ jobs:
111111
include:
112112
- os: ubuntu-22.04
113113
platform: linux-x86_64
114-
- os: macos-13
114+
- os: macos-15
115115
platform: darwin-x86_64
116116
- os: macos-14
117117
platform: darwin-aarch64

.github/workflows/javascript-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
settings:
14-
- host: macos-13
14+
- host: macos-15
1515
target: x86_64-apple-darwin
1616
build: |
1717
yarn build
1818
strip -x *.node
19-
- host: macos-13
19+
- host: macos-15
2020
target: aarch64-apple-darwin
2121
build: |
2222
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*;

.github/workflows/python-release.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
env:
1717
PACKAGE_NAME: css_inline
18-
PYTHON_VERSION: "3.9" # to build abi3 wheels
18+
PYTHON_VERSION: "3.11" # to build abi3 wheels
1919

2020
jobs:
2121
sdist:
@@ -43,7 +43,7 @@ jobs:
4343
path: dist
4444

4545
macos-x86_64:
46-
runs-on: macos-13
46+
runs-on: macos-15
4747
steps:
4848
- uses: actions/checkout@v5
4949
- uses: actions/setup-python@v6
@@ -67,7 +67,7 @@ jobs:
6767
path: dist
6868

6969
macos-universal:
70-
runs-on: macos-13
70+
runs-on: macos-15
7171
steps:
7272
- uses: actions/checkout@v5
7373
- uses: actions/setup-python@v6
@@ -258,15 +258,19 @@ jobs:
258258
runs-on: ${{ matrix.os }}
259259
strategy:
260260
matrix:
261-
os: [ubuntu-22.04, macos-13]
261+
os: [ubuntu-22.04, macos-15]
262262
target: [x86_64, aarch64]
263263
python-version:
264264
- "3.11"
265265
exclude:
266-
- os: macos-13
266+
- os: macos-15
267267
target: aarch64
268268
steps:
269269
- uses: actions/checkout@v5
270+
- uses: dtolnay/rust-toolchain@stable
271+
- name: Add x86_64 target for macOS
272+
if: matrix.os == 'macos-15' && matrix.target == 'x86_64'
273+
run: rustup target add x86_64-apple-darwin
270274
- uses: actions/setup-python@v6
271275
with:
272276
python-version: pypy${{ matrix.python-version }}

0 commit comments

Comments
 (0)