From aa560460ebd5502f91b024452e838889b02e4d78 Mon Sep 17 00:00:00 2001 From: Jonathan Brouwer Date: Sun, 1 Nov 2026 10:52:31 +0100 Subject: [PATCH] Skip cargo --- src/ci/github-actions/jobs.yml | 86 +++++++++++++++++----------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 68298870cf739..f2a70b40ca0aa 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -587,31 +587,31 @@ auto: MACOSX_STD_DEPLOYMENT_TARGET: 11.0 <<: *job-macos-15 -# - name: test-aarch64-apple-2 -# env: -# # NOTE: keep in sync with `src/ci/docker/scripts/stage_2_test_set2.sh`, -# # union `src/tools/cargo` specifically. -# SCRIPT: >- -# ./x.py --stage 2 test -# --host=aarch64-apple-darwin -# --target=aarch64-apple-darwin -# --skip tests -# --skip library -# --skip tidyselftest + - name: test-aarch64-apple-2 + env: + # NOTE: keep in sync with `src/ci/docker/scripts/stage_2_test_set2.sh`, + # union `src/tools/cargo` specifically. + SCRIPT: >- + ./x.py --stage 2 test + --host=aarch64-apple-darwin + --target=aarch64-apple-darwin + --skip tests + --skip library + --skip tidyselftest # && ./x.py --stage 2 test # --host=aarch64-apple-darwin # --target=aarch64-apple-darwin # src/tools/cargo -# RUST_CONFIGURE_ARGS: >- -# --enable-sanitizers -# --enable-profiler -# --set build.allocator=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-15 + RUST_CONFIGURE_ARGS: >- + --enable-sanitizers + --enable-profiler + --set build.allocator=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-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 @@ -640,32 +640,32 @@ auto: MACOSX_STD_DEPLOYMENT_TARGET: 11.0 <<: *job-macos-26 -# - name: test-aarch64-apple-macos-26-2 -# doc_url: https://github.com/rust-lang/rust/issues/157687 -# env: -# # NOTE: keep in sync with `src/ci/docker/scripts/stage_2_test_set2.sh`, -# # union `src/tools/cargo` specifically. -# SCRIPT: >- -# ./x.py --stage 2 test -# --host=aarch64-apple-darwin -# --target=aarch64-apple-darwin -# --skip tests -# --skip library -# --skip tidyselftest + - name: test-aarch64-apple-macos-26-2 + doc_url: https://github.com/rust-lang/rust/issues/157687 + env: + # NOTE: keep in sync with `src/ci/docker/scripts/stage_2_test_set2.sh`, + # union `src/tools/cargo` specifically. + SCRIPT: >- + ./x.py --stage 2 test + --host=aarch64-apple-darwin + --target=aarch64-apple-darwin + --skip tests + --skip library + --skip tidyselftest # && ./x.py --stage 2 test # --host=aarch64-apple-darwin # --target=aarch64-apple-darwin # src/tools/cargo -# RUST_CONFIGURE_ARGS: >- -# --enable-sanitizers -# --enable-profiler -# --set build.allocator=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 + RUST_CONFIGURE_ARGS: >- + --enable-sanitizers + --enable-profiler + --set build.allocator=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 #