Skip to content

Commit e92f252

Browse files
authored
Rollup merge of #89849 - rusticstuff:remove-xcode-select, r=Mark-Simulacrum
CI: Selecting the Xcode version no longer needed with the macos-11 runners. It does nothing nowadays since `/Applications/Xcode_12.2.app` does not exist in the GH runner environment and automatically using the latest version selected by the GH environment is better anyway.
2 parents 9614da2 + 8514b00 commit e92f252

File tree

3 files changed

+0
-28
lines changed

3 files changed

+0
-28
lines changed

.github/workflows/ci.yml

-10
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ jobs:
9292
- name: install sccache
9393
run: src/ci/scripts/install-sccache.sh
9494
if: success() && !env.SKIP_JOB
95-
- name: select Xcode
96-
run: src/ci/scripts/select-xcode.sh
97-
if: success() && !env.SKIP_JOB
9895
- name: install clang
9996
run: src/ci/scripts/install-clang.sh
10097
if: success() && !env.SKIP_JOB
@@ -322,7 +319,6 @@ jobs:
322319
SCRIPT: "./x.py dist --stage 2"
323320
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
324321
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
325-
SELECT_XCODE: /Applications/Xcode_12.2.app
326322
USE_XCODE_CLANG: 1
327323
MACOSX_DEPLOYMENT_TARGET: 11.0
328324
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -467,9 +463,6 @@ jobs:
467463
- name: install sccache
468464
run: src/ci/scripts/install-sccache.sh
469465
if: success() && !env.SKIP_JOB
470-
- name: select Xcode
471-
run: src/ci/scripts/select-xcode.sh
472-
if: success() && !env.SKIP_JOB
473466
- name: install clang
474467
run: src/ci/scripts/install-clang.sh
475468
if: success() && !env.SKIP_JOB
@@ -580,9 +573,6 @@ jobs:
580573
- name: install sccache
581574
run: src/ci/scripts/install-sccache.sh
582575
if: success() && !env.SKIP_JOB
583-
- name: select Xcode
584-
run: src/ci/scripts/select-xcode.sh
585-
if: success() && !env.SKIP_JOB
586576
- name: install clang
587577
run: src/ci/scripts/install-clang.sh
588578
if: success() && !env.SKIP_JOB

src/ci/github-actions/ci.yml

-5
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ x--expand-yaml-anchors--remove:
153153
run: src/ci/scripts/install-sccache.sh
154154
<<: *step
155155

156-
- name: select Xcode
157-
run: src/ci/scripts/select-xcode.sh
158-
<<: *step
159-
160156
- name: install clang
161157
run: src/ci/scripts/install-clang.sh
162158
<<: *step
@@ -498,7 +494,6 @@ jobs:
498494
--set rust.jemalloc
499495
--set llvm.ninja=false
500496
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
501-
SELECT_XCODE: /Applications/Xcode_12.2.app
502497
USE_XCODE_CLANG: 1
503498
MACOSX_DEPLOYMENT_TARGET: 11.0
504499
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

src/ci/scripts/select-xcode.sh

-13
This file was deleted.

0 commit comments

Comments
 (0)