Skip to content

Commit 2242436

Browse files
compiler-errorscuviper
authored andcommitted
Revert "switch to the macos-12-xl builder"
This reverts commit fcbae98.
1 parent 30e7b05 commit 2242436

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
@@ -309,7 +309,7 @@ jobs:
309309
NO_DEBUG_ASSERTIONS: 1
310310
NO_OVERFLOW_CHECKS: 1
311311
DIST_REQUIRE_ALL_TOOLS: 1
312-
os: macos-12-xl
312+
os: macos-latest
313313
- name: dist-apple-various
314314
env:
315315
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -320,7 +320,7 @@ jobs:
320320
NO_LLVM_ASSERTIONS: 1
321321
NO_DEBUG_ASSERTIONS: 1
322322
NO_OVERFLOW_CHECKS: 1
323-
os: macos-12-xl
323+
os: macos-latest
324324
- name: dist-x86_64-apple-alt
325325
env:
326326
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -331,7 +331,7 @@ jobs:
331331
NO_LLVM_ASSERTIONS: 1
332332
NO_DEBUG_ASSERTIONS: 1
333333
NO_OVERFLOW_CHECKS: 1
334-
os: macos-12-xl
334+
os: macos-latest
335335
- name: x86_64-apple-1
336336
env:
337337
SCRIPT: "./x.py --stage 2 test --exclude src/test/ui --exclude src/test/rustdoc --exclude src/test/run-make-fulldeps"
@@ -342,7 +342,7 @@ jobs:
342342
NO_LLVM_ASSERTIONS: 1
343343
NO_DEBUG_ASSERTIONS: 1
344344
NO_OVERFLOW_CHECKS: 1
345-
os: macos-12-xl
345+
os: macos-latest
346346
- name: x86_64-apple-2
347347
env:
348348
SCRIPT: "./x.py --stage 2 test src/test/ui src/test/rustdoc src/test/run-make-fulldeps"
@@ -353,7 +353,7 @@ jobs:
353353
NO_LLVM_ASSERTIONS: 1
354354
NO_DEBUG_ASSERTIONS: 1
355355
NO_OVERFLOW_CHECKS: 1
356-
os: macos-12-xl
356+
os: macos-latest
357357
- name: dist-aarch64-apple
358358
env:
359359
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -368,7 +368,7 @@ jobs:
368368
NO_OVERFLOW_CHECKS: 1
369369
DIST_REQUIRE_ALL_TOOLS: 1
370370
JEMALLOC_SYS_WITH_LG_PAGE: 14
371-
os: macos-12-xl
371+
os: macos-latest
372372
- name: x86_64-msvc-1
373373
env:
374374
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)