nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-apply "switch to the macos-12-xl builder"

Browse Source 
This reverts commit e63ec2e140.
This commit is contained in:
Michael Goulet 2023-02-22 22:13:52 +00:00
parent 375d5ace70
commit 506ce7e3cc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -322,7 +322,7 @@ jobs:
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1 NO_OVERFLOW_CHECKS: 1
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
os: macos-latest os: macos-12-xl
- name: dist-apple-various - name: dist-apple-various
env: env:
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim" 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:
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1 NO_OVERFLOW_CHECKS: 1
os: macos-latest os: macos-12-xl
- name: dist-x86_64-apple-alt - name: dist-x86_64-apple-alt
env: env:
SCRIPT: "./x.py dist bootstrap --include-default-paths" SCRIPT: "./x.py dist bootstrap --include-default-paths"
@ -344,7 +344,7 @@ jobs:
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1 NO_OVERFLOW_CHECKS: 1
os: macos-latest os: macos-12-xl
- name: x86_64-apple-1 - name: x86_64-apple-1
env: env:
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps" SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@ -355,7 +355,7 @@ jobs:
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1 NO_OVERFLOW_CHECKS: 1
os: macos-latest os: macos-12-xl
- name: x86_64-apple-2 - name: x86_64-apple-2
env: env:
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps" SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@ -366,7 +366,7 @@ jobs:
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1 NO_OVERFLOW_CHECKS: 1
os: macos-latest os: macos-12-xl
- name: dist-aarch64-apple - name: dist-aarch64-apple
env: env:
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2" SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@ -381,7 +381,7 @@ jobs:
NO_OVERFLOW_CHECKS: 1 NO_OVERFLOW_CHECKS: 1
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
JEMALLOC_SYS_WITH_LG_PAGE: 14 JEMALLOC_SYS_WITH_LG_PAGE: 14
os: macos-latest os: macos-12-xl
- name: x86_64-msvc-1 - name: x86_64-msvc-1
env: env:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

2
src/ci/github-actions/ci.yml
View File

@ -78,7 +78,7 @@ x--expand-yaml-anchors--remove:
<<: *base-job <<: *base-job
- &job-macos-xl - &job-macos-xl
os: macos-latest # We don't have an XL builder for this os: macos-12-xl
<<: *base-job <<: *base-job
- &job-windows-xl - &job-windows-xl