From bc002f080b8fe42cbfdb22ea7a975af9e81907da Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Thu, 12 Feb 2026 09:22:06 -0500 Subject: [PATCH 1/6] Reformat the aarch64-apple runner invocation --- src/ci/github-actions/jobs.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 0687d142a3504..1284fd227c22e 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -526,9 +526,17 @@ auto: - name: aarch64-apple 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 + SCRIPT: >- + ./x.py test + --stage 2 + --host=aarch64-apple-darwin + --target=aarch64-apple-darwin + && + ./x.py test + --stage 2 + --host=aarch64-apple-darwin + --target=aarch64-apple-darwin + src/tools/cargo RUST_CONFIGURE_ARGS: >- --enable-sanitizers --enable-profiler From ccb9da4d47249967fe39dc7058499eb2867d6988 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Tue, 30 Sep 2025 09:45:49 -0400 Subject: [PATCH 2/6] Extract common macOS x86_64 target environment --- src/ci/github-actions/jobs.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 1284fd227c22e..9b59da007ee91 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -90,6 +90,12 @@ envs: pr: PR_CI_JOB: 1 + # Ensure that host tooling is tested on our minimum supported macOS + # version. + env-macos-x86_64-target: &env-macos-x86_64-target + MACOSX_DEPLOYMENT_TARGET: 10.12 + MACOSX_STD_DEPLOYMENT_TARGET: 10.12 + jobs: dist-x86_64-linux: &job-dist-x86_64-linux name: dist-x86_64-linux @@ -456,10 +462,8 @@ auto: --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1 - # Ensure that host tooling is built to support our minimum support macOS version. - MACOSX_DEPLOYMENT_TARGET: 10.12 - MACOSX_STD_DEPLOYMENT_TARGET: 10.12 DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer + <<: *env-macos-x86_64-target DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift <<: *job-macos @@ -494,11 +498,9 @@ auto: --set target.aarch64-apple-tvos-sim.profiler=false --set target.aarch64-apple-watchos.profiler=false --set target.aarch64-apple-watchos-sim.profiler=false - # Ensure that host tooling is built to support our minimum support macOS version. - # FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?) - MACOSX_DEPLOYMENT_TARGET: 10.12 - MACOSX_STD_DEPLOYMENT_TARGET: 10.12 DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer + # FIXME(madsmtm): Setting the target might be redundant, as we're not building host tooling here (?) + <<: *env-macos-x86_64-target <<: *job-macos - name: dist-aarch64-apple From 5f7b11c22b6e654274df607fc2fd5653bbcc9dde Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Tue, 30 Sep 2025 09:48:43 -0400 Subject: [PATCH 3/6] Extract common macOS aarch64 target environment --- src/ci/github-actions/jobs.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 9b59da007ee91..41e263ceb4cd8 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -96,6 +96,12 @@ envs: MACOSX_DEPLOYMENT_TARGET: 10.12 MACOSX_STD_DEPLOYMENT_TARGET: 10.12 + # Aarch64 tooling only needs to support macOS 11.0 as this is the + # first OS version to support the hardware. + env-macos-aarch64-target: &env-macos-aarch64-target + MACOSX_DEPLOYMENT_TARGET: 11.0 + MACOSX_STD_DEPLOYMENT_TARGET: 11.0 + jobs: dist-x86_64-linux: &job-dist-x86_64-linux name: dist-x86_64-linux @@ -517,11 +523,8 @@ auto: --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1 - # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else - # supports the hardware. - MACOSX_DEPLOYMENT_TARGET: 11.0 - MACOSX_STD_DEPLOYMENT_TARGET: 11.0 DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer + <<: *env-macos-aarch64-target DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift <<: *job-macos @@ -544,10 +547,7 @@ auto: --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 + <<: *env-macos-aarch64-target <<: *job-macos ###################### From 7077dc8f1824bc4a8d39085ef7b0d4c0866e83d9 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Tue, 30 Sep 2025 12:21:17 -0400 Subject: [PATCH 4/6] Resume testing macOS x86_64 --- src/ci/github-actions/jobs.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 41e263ceb4cd8..16d4222e20344 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -26,6 +26,10 @@ runners: os: macos-15 # macOS 15 Arm64 <<: *base-job + - &job-macos-x86_64 + os: macos-15-intel + <<: *base-job + - &job-windows os: windows-2025 <<: *base-job @@ -474,6 +478,32 @@ auto: CODEGEN_BACKENDS: llvm,cranelift <<: *job-macos + - name: x86_64-apple + env: + SCRIPT: >- + ./x.py test + --stage 2 + --host=x86_64-apple-darwin + --target=x86_64-apple-darwin + && + ./x.py test + --stage 2 + --host=x86_64-apple-darwin + --target=x86_64-apple-darwin + src/tools/cargo + RUST_CONFIGURE_ARGS: >- + --enable-sanitizers + --enable-profiler + --set rust.jemalloc + DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer + # The x86_64 macOS builders are relatively slow, so we disable + # extra assertions/checks to get back a bit of speed. + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + NO_OVERFLOW_CHECKS: 1 + <<: *env-macos-x86_64-target + <<: *job-macos-x86_64 + - name: dist-apple-various env: # Build and distribute the standard library for these targets. From e30d9a6e14cdcbbb8263a315aa558db38a6db733 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Fri, 13 Feb 2026 19:16:54 -0500 Subject: [PATCH 5/6] what if we just... didnt --- src/ci/github-actions/jobs.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 16d4222e20344..5a4f8c0fe90f9 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -485,12 +485,6 @@ auto: --stage 2 --host=x86_64-apple-darwin --target=x86_64-apple-darwin - && - ./x.py test - --stage 2 - --host=x86_64-apple-darwin - --target=x86_64-apple-darwin - src/tools/cargo RUST_CONFIGURE_ARGS: >- --enable-sanitizers --enable-profiler From 2e685fd027badf25188a9c3eec949128456582f2 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Fri, 27 Feb 2026 10:08:26 -0500 Subject: [PATCH 6/6] Test with macOS 26 --- src/ci/github-actions/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 5a4f8c0fe90f9..e2d81dc6abc25 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -27,7 +27,7 @@ runners: <<: *base-job - &job-macos-x86_64 - os: macos-15-intel + os: macos-26-intel <<: *base-job - &job-windows