Skip to content

Commit 0e31fdb

Browse files
compiler-errorscuviper
authored andcommitted
Revert "switch to the macos-12-xl builder"
This reverts commit fcbae98.
1 parent 0fe1bba commit 0e31fdb

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
@@ -317,7 +317,7 @@ jobs:
317317
NO_DEBUG_ASSERTIONS: 1
318318
NO_OVERFLOW_CHECKS: 1
319319
DIST_REQUIRE_ALL_TOOLS: 1
320-
os: macos-12-xl
320+
os: macos-latest
321321
- name: dist-apple-various
322322
env:
323323
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -328,7 +328,7 @@ jobs:
328328
NO_LLVM_ASSERTIONS: 1
329329
NO_DEBUG_ASSERTIONS: 1
330330
NO_OVERFLOW_CHECKS: 1
331-
os: macos-12-xl
331+
os: macos-latest
332332
- name: dist-x86_64-apple-alt
333333
env:
334334
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -339,7 +339,7 @@ jobs:
339339
NO_LLVM_ASSERTIONS: 1
340340
NO_DEBUG_ASSERTIONS: 1
341341
NO_OVERFLOW_CHECKS: 1
342-
os: macos-12-xl
342+
os: macos-latest
343343
- name: x86_64-apple-1
344344
env:
345345
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -350,7 +350,7 @@ jobs:
350350
NO_LLVM_ASSERTIONS: 1
351351
NO_DEBUG_ASSERTIONS: 1
352352
NO_OVERFLOW_CHECKS: 1
353-
os: macos-12-xl
353+
os: macos-latest
354354
- name: x86_64-apple-2
355355
env:
356356
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -361,7 +361,7 @@ jobs:
361361
NO_LLVM_ASSERTIONS: 1
362362
NO_DEBUG_ASSERTIONS: 1
363363
NO_OVERFLOW_CHECKS: 1
364-
os: macos-12-xl
364+
os: macos-latest
365365
- name: dist-aarch64-apple
366366
env:
367367
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -376,7 +376,7 @@ jobs:
376376
NO_OVERFLOW_CHECKS: 1
377377
DIST_REQUIRE_ALL_TOOLS: 1
378378
JEMALLOC_SYS_WITH_LG_PAGE: 14
379-
os: macos-12-xl
379+
os: macos-latest
380380
- name: x86_64-msvc-1
381381
env:
382382
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
@@ -77,7 +77,7 @@ x--expand-yaml-anchors--remove:
7777
<<: *base-job
7878

7979
- &job-macos-xl
80-
os: macos-12-xl
80+
os: macos-latest # We don't have an XL builder for this
8181
<<: *base-job
8282

8383
- &job-windows-xl

0 commit comments

Comments
 (0)