Skip to content

Commit 343b469

Browse files
madsmtmmadsmtm
committed
Update to Xcode 26.2
This also updates the macOS runners to run on macOS 15 (the macOS 14 runners only have up to Xcode 16.2 available).
1 parent bce89b6 commit 343b469

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎src/ci/citool/tests/jobs.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const TEST_JOBS_YML_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/tes
66
fn auto_jobs() {
77
let stdout = get_matrix("push", "commit", "refs/heads/automation/bors/auto");
88
insta::assert_snapshot!(stdout, @r#"
9-
jobs=[{"name":"aarch64-gnu","full_name":"auto - aarch64-gnu","os":"ubuntu-22.04-arm","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"x86_64-gnu-llvm-18-1","full_name":"auto - x86_64-gnu-llvm-18-1","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","DOCKER_SCRIPT":"stage_2_test_set1.sh","IMAGE":"x86_64-gnu-llvm-18","READ_ONLY_SRC":"0","RUST_BACKTRACE":1,"TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"aarch64-apple","full_name":"auto - aarch64-apple","os":"macos-14","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","DEVELOPER_DIR":"/Applications/Xcode_15.4.app/Contents/Developer","MACOSX_DEPLOYMENT_TARGET":11.0,"MACOSX_STD_DEPLOYMENT_TARGET":11.0,"NO_DEBUG_ASSERTIONS":1,"NO_LLVM_ASSERTIONS":1,"NO_OVERFLOW_CHECKS":1,"RUSTC_RETRY_LINKER_ON_SEGFAULT":1,"RUST_CONFIGURE_ARGS":"--enable-sanitizers --enable-profiler --set rust.jemalloc","SCRIPT":"./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin","TOOLSTATE_PUBLISH":1}},{"name":"dist-i686-msvc","full_name":"auto - dist-i686-msvc","os":"windows-2022","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","CODEGEN_BACKENDS":"llvm,cranelift","DEPLOY_BUCKET":"rust-lang-ci2","DIST_REQUIRE_ALL_TOOLS":1,"RUST_CONFIGURE_ARGS":"--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler","SCRIPT":"python x.py dist bootstrap --include-default-paths","TOOLSTATE_PUBLISH":1}},{"name":"pr-check-1","full_name":"auto - pr-check-1","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true},{"name":"pr-check-2","full_name":"auto - pr-check-2","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true},{"name":"tidy","full_name":"auto - tidy","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true,"doc_url":"https://foo.bar"}]
9+
jobs=[{"name":"aarch64-gnu","full_name":"auto - aarch64-gnu","os":"ubuntu-22.04-arm","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"x86_64-gnu-llvm-18-1","full_name":"auto - x86_64-gnu-llvm-18-1","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","DOCKER_SCRIPT":"stage_2_test_set1.sh","IMAGE":"x86_64-gnu-llvm-18","READ_ONLY_SRC":"0","RUST_BACKTRACE":1,"TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"aarch64-apple","full_name":"auto - aarch64-apple","os":"macos-15","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","DEVELOPER_DIR":"/Applications/Xcode_26.2.app/Contents/Developer","MACOSX_DEPLOYMENT_TARGET":11.0,"MACOSX_STD_DEPLOYMENT_TARGET":11.0,"NO_DEBUG_ASSERTIONS":1,"NO_LLVM_ASSERTIONS":1,"NO_OVERFLOW_CHECKS":1,"RUSTC_RETRY_LINKER_ON_SEGFAULT":1,"RUST_CONFIGURE_ARGS":"--enable-sanitizers --enable-profiler --set rust.jemalloc","SCRIPT":"./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin","TOOLSTATE_PUBLISH":1}},{"name":"dist-i686-msvc","full_name":"auto - dist-i686-msvc","os":"windows-2022","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","CODEGEN_BACKENDS":"llvm,cranelift","DEPLOY_BUCKET":"rust-lang-ci2","DIST_REQUIRE_ALL_TOOLS":1,"RUST_CONFIGURE_ARGS":"--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler","SCRIPT":"python x.py dist bootstrap --include-default-paths","TOOLSTATE_PUBLISH":1}},{"name":"pr-check-1","full_name":"auto - pr-check-1","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true},{"name":"pr-check-2","full_name":"auto - pr-check-2","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true},{"name":"tidy","full_name":"auto - tidy","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true,"doc_url":"https://foo.bar"}]
1010
run_type=auto
1111
"#);
1212
}

‎src/ci/citool/tests/test-jobs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runners:
1313
<<: *base-job
1414

1515
- &job-macos-m1
16-
os: macos-14
16+
os: macos-15
1717
<<: *base-job
1818

1919
- &job-windows
@@ -33,7 +33,7 @@ envs:
3333
# Ensure that host tooling is tested on our minimum supported macOS version.
3434
MACOSX_DEPLOYMENT_TARGET: 10.12
3535
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
36-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
36+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
3737
NO_LLVM_ASSERTIONS: 1
3838
NO_DEBUG_ASSERTIONS: 1
3939
NO_OVERFLOW_CHECKS: 1
@@ -112,7 +112,7 @@ auto:
112112
--enable-profiler
113113
--set rust.jemalloc
114114
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
115-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
115+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
116116
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
117117
# supports the hardware, so only need to test it there.
118118
MACOSX_DEPLOYMENT_TARGET: 11.0

‎src/ci/github-actions/jobs.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runners:
2323
<<: *base-job
2424

2525
- &job-macos
26-
os: macos-14
26+
os: macos-15 # macOS 15 Arm64
2727
<<: *base-job
2828

2929
- &job-windows
@@ -459,7 +459,7 @@ auto:
459459
# Ensure that host tooling is built to support our minimum support macOS version.
460460
MACOSX_DEPLOYMENT_TARGET: 10.12
461461
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
462-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
462+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
463463
DIST_REQUIRE_ALL_TOOLS: 1
464464
CODEGEN_BACKENDS: llvm,cranelift
465465
<<: *job-macos
@@ -474,7 +474,7 @@ auto:
474474
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
475475
MACOSX_DEPLOYMENT_TARGET: 10.12
476476
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
477-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
477+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
478478
<<: *job-macos
479479

480480
- name: dist-aarch64-apple
@@ -495,7 +495,7 @@ auto:
495495
# supports the hardware.
496496
MACOSX_DEPLOYMENT_TARGET: 11.0
497497
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
498-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
498+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
499499
DIST_REQUIRE_ALL_TOOLS: 1
500500
CODEGEN_BACKENDS: llvm,cranelift
501501
<<: *job-macos
@@ -509,7 +509,7 @@ auto:
509509
--enable-sanitizers
510510
--enable-profiler
511511
--set rust.jemalloc
512-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
512+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
513513
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
514514
# supports the hardware, so only need to test it there.
515515
MACOSX_DEPLOYMENT_TARGET: 11.0

0 commit comments

Comments
 (0)