Skip to content

Commit f9861cc

Browse files
committed
Auto merge of #157258 - jieyouxu:jieyouxu/exp/macos-15-26-up-to-stage1-only, r=<try>
[EXPERIMENTAL] Do not look (part 2) try-job: aarch64-apple-macos-15 try-job: aarch64-apple-macos-26
2 parents 4f84d9f + 9b695da commit f9861cc

1 file changed

Lines changed: 24 additions & 3 deletions

File tree

src/ci/github-actions/jobs.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ runners:
2626
os: macos-15 # macOS 15 Arm64
2727
<<: *base-job
2828

29+
- &job-macos-26
30+
os: macos-26 # macOS 26 Arm64
31+
<<: *base-job
32+
2933
- &job-windows
3034
os: windows-2025
3135
<<: *base-job
@@ -529,6 +533,7 @@ auto:
529533
--set llvm.link-shared=true
530534
--set rust.lto=thin
531535
--set rust.codegen-units=1
536+
--set build.ccache=false
532537
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
533538
# supports the hardware.
534539
MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -538,11 +543,10 @@ auto:
538543
CODEGEN_BACKENDS: llvm,cranelift
539544
<<: *job-macos
540545

541-
- name: aarch64-apple
546+
- name: aarch64-apple-macos-15
542547
env:
543548
SCRIPT: >
544-
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin &&
545-
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin src/tools/cargo
549+
./x.py test --stage=1 library --host=aarch64-apple-darwin --target=aarch64-apple-darwin
546550
RUST_CONFIGURE_ARGS: >-
547551
--enable-sanitizers
548552
--enable-profiler
@@ -552,8 +556,25 @@ auto:
552556
# supports the hardware, so only need to test it there.
553557
MACOSX_DEPLOYMENT_TARGET: 11.0
554558
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
559+
# XXX: try macos-15 runners
555560
<<: *job-macos
556561

562+
- name: aarch64-apple-macos-26
563+
env:
564+
SCRIPT: >
565+
./x.py test --stage=1 library --host=aarch64-apple-darwin --target=aarch64-apple-darwin
566+
RUST_CONFIGURE_ARGS: >-
567+
--enable-sanitizers
568+
--enable-profiler
569+
--set rust.jemalloc
570+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
571+
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
572+
# supports the hardware, so only need to test it there.
573+
MACOSX_DEPLOYMENT_TARGET: 11.0
574+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
575+
# XXX: try macos-26 runners
576+
<<: *job-macos-26
577+
557578
######################
558579
# Windows Builders #
559580
######################

0 commit comments

Comments
 (0)