Skip to content

Commit 1d4f5af

Browse files
committed
Auto merge of rust-lang#113544 - Kobzol:ci-macos-13, r=jyn514
CI: use `macos-13` runner for Apple jobs Trying if performance of Apple CI improves with macOS 13 and SIP disabled. Speed-up: ``` x86_64-apple-1: ~2h 20m > ~1h 20m x86_64-apple-2: ~1h 45m > ~1h 15m ``` r? `@pietroalbini`
2 parents 8ca44ef + 8e0a87b commit 1d4f5af

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ jobs:
315315
NO_DEBUG_ASSERTIONS: 1
316316
NO_OVERFLOW_CHECKS: 1
317317
DIST_REQUIRE_ALL_TOOLS: 1
318-
os: macos-latest
318+
os: macos-13
319319
- name: dist-apple-various
320320
env:
321321
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -326,7 +326,7 @@ jobs:
326326
NO_LLVM_ASSERTIONS: 1
327327
NO_DEBUG_ASSERTIONS: 1
328328
NO_OVERFLOW_CHECKS: 1
329-
os: macos-latest
329+
os: macos-13
330330
- name: dist-x86_64-apple-alt
331331
env:
332332
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -337,7 +337,7 @@ jobs:
337337
NO_LLVM_ASSERTIONS: 1
338338
NO_DEBUG_ASSERTIONS: 1
339339
NO_OVERFLOW_CHECKS: 1
340-
os: macos-latest
340+
os: macos-13
341341
- name: x86_64-apple-1
342342
env:
343343
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -348,7 +348,7 @@ jobs:
348348
NO_LLVM_ASSERTIONS: 1
349349
NO_DEBUG_ASSERTIONS: 1
350350
NO_OVERFLOW_CHECKS: 1
351-
os: macos-latest
351+
os: macos-13
352352
- name: x86_64-apple-2
353353
env:
354354
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -359,7 +359,7 @@ jobs:
359359
NO_LLVM_ASSERTIONS: 1
360360
NO_DEBUG_ASSERTIONS: 1
361361
NO_OVERFLOW_CHECKS: 1
362-
os: macos-latest
362+
os: macos-13
363363
- name: dist-aarch64-apple
364364
env:
365365
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -374,7 +374,7 @@ jobs:
374374
NO_OVERFLOW_CHECKS: 1
375375
DIST_REQUIRE_ALL_TOOLS: 1
376376
JEMALLOC_SYS_WITH_LG_PAGE: 14
377-
os: macos-latest
377+
os: macos-13
378378
- name: x86_64-msvc
379379
env:
380380
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ x--expand-yaml-anchors--remove:
9090
<<: *base-job
9191

9292
- &job-macos-xl
93-
os: macos-latest # We use the standard runner for now
93+
os: macos-13 # We use the standard runner for now
9494
<<: *base-job
9595

9696
- &job-windows-8c

0 commit comments

Comments
 (0)