Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ runners:
os: ubuntu-24.04-16core-64gb
<<: *base-job

- &job-macos
- &job-macos-15
os: macos-15 # macOS 15 Arm64
<<: *base-job

- &job-macos-26
os: macos-26 # macOS 26 Arm64
<<: *base-job

- &job-windows
os: windows-2025
<<: *base-job
Expand Down Expand Up @@ -476,7 +480,7 @@ auto:
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-macos
<<: *job-macos-15

- name: dist-apple-various
env:
Expand Down Expand Up @@ -513,7 +517,7 @@ auto:
MACOSX_DEPLOYMENT_TARGET: 10.12
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
<<: *job-macos
<<: *job-macos-15

- name: dist-aarch64-apple
env:
Expand All @@ -537,7 +541,7 @@ auto:
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-macos
<<: *job-macos-15

- name: aarch64-apple
env:
Expand All @@ -553,7 +557,29 @@ auto:
# supports the hardware, so only need to test it there.
MACOSX_DEPLOYMENT_TARGET: 11.0
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
<<: *job-macos
<<: *job-macos-15

# EXPERIMENT(#157687): we will try to run `aarch64-apple`-equivalent workload
# on `macos-26` runner images in parallel to evaluate the running times, since
# previous attempts have timed out multiple times. Remove/revert this job if
# this hangs or times out, or if it becomes the slowest Merge CI job, and let
# T-infra know.
- name: aarch64-apple-macos-26
doc_url: https://github.com/rust-lang/rust/issues/157687
env:
SCRIPT: >
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin &&
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin src/tools/cargo
RUST_CONFIGURE_ARGS: >-
--enable-sanitizers
--enable-profiler
--set rust.jemalloc
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
# supports the hardware, so only need to test it there.
MACOSX_DEPLOYMENT_TARGET: 11.0
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
<<: *job-macos-26

######################
# Windows Builders #
Expand Down
Loading