Skip to content

Commit 8789e53

Browse files
committed
Auto merge of #107574 - compiler-errors:back-to-old-mac-builders-pls, r=pietroalbini
Revert "switch to the macos-12-xl builder" This reverts commit fcbae98. This should fix the bors failures in https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Every.20rust-lang.2Frust.20PR.20is.20failing.20bors
2 parents 11d96b5 + e63ec2e commit 8789e53

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
@@ -325,7 +325,7 @@ jobs:
325325
NO_DEBUG_ASSERTIONS: 1
326326
NO_OVERFLOW_CHECKS: 1
327327
DIST_REQUIRE_ALL_TOOLS: 1
328-
os: macos-12-xl
328+
os: macos-latest
329329
- name: dist-apple-various
330330
env:
331331
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -336,7 +336,7 @@ jobs:
336336
NO_LLVM_ASSERTIONS: 1
337337
NO_DEBUG_ASSERTIONS: 1
338338
NO_OVERFLOW_CHECKS: 1
339-
os: macos-12-xl
339+
os: macos-latest
340340
- name: dist-x86_64-apple-alt
341341
env:
342342
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -347,7 +347,7 @@ jobs:
347347
NO_LLVM_ASSERTIONS: 1
348348
NO_DEBUG_ASSERTIONS: 1
349349
NO_OVERFLOW_CHECKS: 1
350-
os: macos-12-xl
350+
os: macos-latest
351351
- name: x86_64-apple-1
352352
env:
353353
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -358,7 +358,7 @@ jobs:
358358
NO_LLVM_ASSERTIONS: 1
359359
NO_DEBUG_ASSERTIONS: 1
360360
NO_OVERFLOW_CHECKS: 1
361-
os: macos-12-xl
361+
os: macos-latest
362362
- name: x86_64-apple-2
363363
env:
364364
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -369,7 +369,7 @@ jobs:
369369
NO_LLVM_ASSERTIONS: 1
370370
NO_DEBUG_ASSERTIONS: 1
371371
NO_OVERFLOW_CHECKS: 1
372-
os: macos-12-xl
372+
os: macos-latest
373373
- name: dist-aarch64-apple
374374
env:
375375
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -384,7 +384,7 @@ jobs:
384384
NO_OVERFLOW_CHECKS: 1
385385
DIST_REQUIRE_ALL_TOOLS: 1
386386
JEMALLOC_SYS_WITH_LG_PAGE: 14
387-
os: macos-12-xl
387+
os: macos-latest
388388
- name: x86_64-msvc-1
389389
env:
390390
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)