Skip to content

Commit b05ee4d

Browse files
Auto merge of #145252 - shepmaster:demote-x86_64-apple-darwin-to-tier-2, r=<try>
Demote x86_64-apple-darwin to Tier 2 with host tools try-job: dist-x86_64-apple
2 parents 5771665 + c82a9f2 commit b05ee4d

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ runners:
2323
<<: *base-job
2424

2525
- &job-macos
26-
os: macos-13
27-
<<: *base-job
28-
29-
- &job-macos-m1
3026
os: macos-14
3127
<<: *base-job
3228

@@ -68,17 +64,6 @@ runners:
6864
<<: *base-job
6965

7066
envs:
71-
env-x86_64-apple-tests: &env-x86_64-apple-tests
72-
SCRIPT: ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
73-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
74-
# Ensure that host tooling is tested on our minimum supported macOS version.
75-
MACOSX_DEPLOYMENT_TARGET: 10.12
76-
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
77-
SELECT_XCODE: /Applications/Xcode_15.2.app
78-
NO_LLVM_ASSERTIONS: 1
79-
NO_DEBUG_ASSERTIONS: 1
80-
NO_OVERFLOW_CHECKS: 1
81-
8267
production:
8368
&production
8469
DEPLOY_BUCKET: rust-lang-ci2
@@ -482,17 +467,6 @@ auto:
482467
NO_LLVM_ASSERTIONS: 1
483468
NO_DEBUG_ASSERTIONS: 1
484469
NO_OVERFLOW_CHECKS: 1
485-
<<: *job-macos-m1
486-
487-
- name: x86_64-apple-1
488-
env:
489-
<<: *env-x86_64-apple-tests
490-
<<: *job-macos
491-
492-
- name: x86_64-apple-2
493-
env:
494-
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc
495-
<<: *env-x86_64-apple-tests
496470
<<: *job-macos
497471

498472
- name: dist-aarch64-apple
@@ -517,7 +491,7 @@ auto:
517491
NO_OVERFLOW_CHECKS: 1
518492
DIST_REQUIRE_ALL_TOOLS: 1
519493
CODEGEN_BACKENDS: llvm,cranelift
520-
<<: *job-macos-m1
494+
<<: *job-macos
521495

522496
- name: aarch64-apple
523497
env:
@@ -537,7 +511,7 @@ auto:
537511
NO_LLVM_ASSERTIONS: 1
538512
NO_DEBUG_ASSERTIONS: 1
539513
NO_OVERFLOW_CHECKS: 1
540-
<<: *job-macos-m1
514+
<<: *job-macos
541515

542516
######################
543517
# Windows Builders #

0 commit comments

Comments
 (0)