@@ -23,10 +23,6 @@ runners:
23
23
<< : *base-job
24
24
25
25
- &job-macos
26
- os : macos-13
27
- << : *base-job
28
-
29
- - &job-macos-m1
30
26
os : macos-14
31
27
<< : *base-job
32
28
@@ -68,17 +64,6 @@ runners:
68
64
<< : *base-job
69
65
70
66
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
-
82
67
production :
83
68
&production
84
69
DEPLOY_BUCKET : rust-lang-ci2
@@ -456,7 +441,14 @@ auto:
456
441
- name : dist-x86_64-apple
457
442
env :
458
443
SCRIPT : ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
459
- RUST_CONFIGURE_ARGS : --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
444
+ RUST_CONFIGURE_ARGS : >-
445
+ --enable-full-tools
446
+ --enable-sanitizers
447
+ --enable-profiler
448
+ --disable-docs
449
+ --set rust.jemalloc
450
+ --set rust.lto=thin
451
+ --set rust.codegen-units=1
460
452
# Ensure that host tooling is built to support our minimum support macOS version.
461
453
MACOSX_DEPLOYMENT_TARGET : 10.12
462
454
MACOSX_STD_DEPLOYMENT_TARGET : 10.12
@@ -482,17 +474,6 @@ auto:
482
474
NO_LLVM_ASSERTIONS : 1
483
475
NO_DEBUG_ASSERTIONS : 1
484
476
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
496
477
<< : *job-macos
497
478
498
479
- name : dist-aarch64-apple
@@ -517,7 +498,7 @@ auto:
517
498
NO_OVERFLOW_CHECKS : 1
518
499
DIST_REQUIRE_ALL_TOOLS : 1
519
500
CODEGEN_BACKENDS : llvm,cranelift
520
- << : *job-macos-m1
501
+ << : *job-macos
521
502
522
503
- name : aarch64-apple
523
504
env :
@@ -537,7 +518,7 @@ auto:
537
518
NO_LLVM_ASSERTIONS : 1
538
519
NO_DEBUG_ASSERTIONS : 1
539
520
NO_OVERFLOW_CHECKS : 1
540
- << : *job-macos-m1
521
+ << : *job-macos
541
522
542
523
# #####################
543
524
# Windows Builders #
0 commit comments