Skip to content

Commit a441144

Browse files
authored
Rollup merge of #110792 - rylev:standard-macos-ci, r=pietroalbini
Use the standard macOS CI runner This moves back to the standard macOS CI runner instead of the large runners. The infra team is discussing whether the large runners are worth the cost at our heavy usage and whether those credits are better spent elsewhere. This will slow down CI build times unfortunately, but while we figure out our CI spending budget, that's a price we'll unfortunately have to pay. r? `@pietroalbini`
2 parents 62b5bea + 241cbca commit a441144

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
@@ -326,7 +326,7 @@ jobs:
326326
NO_DEBUG_ASSERTIONS: 1
327327
NO_OVERFLOW_CHECKS: 1
328328
DIST_REQUIRE_ALL_TOOLS: 1
329-
os: macos-12-xl
329+
os: macos-latest
330330
- name: dist-apple-various
331331
env:
332332
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -337,7 +337,7 @@ jobs:
337337
NO_LLVM_ASSERTIONS: 1
338338
NO_DEBUG_ASSERTIONS: 1
339339
NO_OVERFLOW_CHECKS: 1
340-
os: macos-12-xl
340+
os: macos-latest
341341
- name: dist-x86_64-apple-alt
342342
env:
343343
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -348,7 +348,7 @@ jobs:
348348
NO_LLVM_ASSERTIONS: 1
349349
NO_DEBUG_ASSERTIONS: 1
350350
NO_OVERFLOW_CHECKS: 1
351-
os: macos-12-xl
351+
os: macos-latest
352352
- name: x86_64-apple-1
353353
env:
354354
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude 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-12-xl
362+
os: macos-latest
363363
- name: x86_64-apple-2
364364
env:
365365
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -370,7 +370,7 @@ jobs:
370370
NO_LLVM_ASSERTIONS: 1
371371
NO_DEBUG_ASSERTIONS: 1
372372
NO_OVERFLOW_CHECKS: 1
373-
os: macos-12-xl
373+
os: macos-latest
374374
- name: dist-aarch64-apple
375375
env:
376376
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -385,7 +385,7 @@ jobs:
385385
NO_OVERFLOW_CHECKS: 1
386386
DIST_REQUIRE_ALL_TOOLS: 1
387387
JEMALLOC_SYS_WITH_LG_PAGE: 14
388-
os: macos-12-xl
388+
os: macos-latest
389389
- name: x86_64-msvc-1
390390
env:
391391
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
@@ -82,7 +82,7 @@ x--expand-yaml-anchors--remove:
8282
<<: *base-job
8383

8484
- &job-macos-xl
85-
os: macos-12-xl
85+
os: macos-latest # We use the standard runner for now
8686
<<: *base-job
8787

8888
- &job-windows-8c

0 commit comments

Comments
 (0)