Skip to content

Commit a27a4e4

Browse files
authored
Rollup merge of #108367 - compiler-errors:xl-builders-again, r=pietroalbini
Re-apply "switch to the macos-12-xl builder" This reverts commit e63ec2e, essentially re-applying fcbae98. r? ````@pietroalbini````
2 parents f75f440 + 506ce7e commit a27a4e4

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
@@ -322,7 +322,7 @@ jobs:
322322
NO_DEBUG_ASSERTIONS: 1
323323
NO_OVERFLOW_CHECKS: 1
324324
DIST_REQUIRE_ALL_TOOLS: 1
325-
os: macos-latest
325+
os: macos-12-xl
326326
- name: dist-apple-various
327327
env:
328328
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -333,7 +333,7 @@ jobs:
333333
NO_LLVM_ASSERTIONS: 1
334334
NO_DEBUG_ASSERTIONS: 1
335335
NO_OVERFLOW_CHECKS: 1
336-
os: macos-latest
336+
os: macos-12-xl
337337
- name: dist-x86_64-apple-alt
338338
env:
339339
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -344,7 +344,7 @@ jobs:
344344
NO_LLVM_ASSERTIONS: 1
345345
NO_DEBUG_ASSERTIONS: 1
346346
NO_OVERFLOW_CHECKS: 1
347-
os: macos-latest
347+
os: macos-12-xl
348348
- name: x86_64-apple-1
349349
env:
350350
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -355,7 +355,7 @@ jobs:
355355
NO_LLVM_ASSERTIONS: 1
356356
NO_DEBUG_ASSERTIONS: 1
357357
NO_OVERFLOW_CHECKS: 1
358-
os: macos-latest
358+
os: macos-12-xl
359359
- name: x86_64-apple-2
360360
env:
361361
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -366,7 +366,7 @@ jobs:
366366
NO_LLVM_ASSERTIONS: 1
367367
NO_DEBUG_ASSERTIONS: 1
368368
NO_OVERFLOW_CHECKS: 1
369-
os: macos-latest
369+
os: macos-12-xl
370370
- name: dist-aarch64-apple
371371
env:
372372
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -381,7 +381,7 @@ jobs:
381381
NO_OVERFLOW_CHECKS: 1
382382
DIST_REQUIRE_ALL_TOOLS: 1
383383
JEMALLOC_SYS_WITH_LG_PAGE: 14
384-
os: macos-latest
384+
os: macos-12-xl
385385
- name: x86_64-msvc-1
386386
env:
387387
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
@@ -78,7 +78,7 @@ x--expand-yaml-anchors--remove:
7878
<<: *base-job
7979

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

8484
- &job-windows-xl

0 commit comments

Comments
 (0)