Skip to content

Commit f24fe47

Browse files
borsbors
committed
Auto merge of #152013 - madsmtm:update-xcode, r=<try>
Update to Xcode 26.2 try-job: *apple*
2 parents 46c86ae + bb9b03f commit f24fe47

File tree

5 files changed

+10
-23
lines changed

5 files changed

+10
-23
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ jobs:
165165
- name: install sccache
166166
run: src/ci/scripts/install-sccache.sh
167167

168-
- name: select Xcode
169-
run: src/ci/scripts/select-xcode.sh
170-
171168
- name: install clang
172169
run: src/ci/scripts/install-clang.sh
173170

‎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","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","SELECT_XCODE":"/Applications/Xcode_15.4.app","TOOLSTATE_PUBLISH":1,"USE_XCODE_CLANG":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-14","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","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","DEVELOPER_DIR":"/Applications/Xcode_26.2.app/Contents/Developer","TOOLSTATE_PUBLISH":1,"USE_XCODE_CLANG":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-
SELECT_XCODE: /Applications/Xcode_15.2.app
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-
SELECT_XCODE: /Applications/Xcode_15.4.app
115+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
116116
USE_XCODE_CLANG: 1
117117
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
118118
# supports the hardware, so only need to test it there.

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

Lines changed: 6 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-
SELECT_XCODE: /Applications/Xcode_15.4.app
462+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
463463
USE_XCODE_CLANG: 1
464464
DIST_REQUIRE_ALL_TOOLS: 1
465465
CODEGEN_BACKENDS: llvm,cranelift
@@ -475,7 +475,8 @@ auto:
475475
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
476476
MACOSX_DEPLOYMENT_TARGET: 10.12
477477
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
478-
SELECT_XCODE: /Applications/Xcode_15.2.app
478+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
479+
USE_XCODE_CLANG: 1
479480
<<: *job-macos
480481

481482
- name: dist-aarch64-apple
@@ -496,7 +497,7 @@ auto:
496497
# supports the hardware.
497498
MACOSX_DEPLOYMENT_TARGET: 11.0
498499
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
499-
SELECT_XCODE: /Applications/Xcode_15.4.app
500+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
500501
USE_XCODE_CLANG: 1
501502
DIST_REQUIRE_ALL_TOOLS: 1
502503
CODEGEN_BACKENDS: llvm,cranelift
@@ -511,7 +512,7 @@ auto:
511512
--enable-sanitizers
512513
--enable-profiler
513514
--set rust.jemalloc
514-
SELECT_XCODE: /Applications/Xcode_15.4.app
515+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
515516
USE_XCODE_CLANG: 1
516517
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
517518
# supports the hardware, so only need to test it there.

‎src/ci/scripts/select-xcode.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)