diff options
| author | bors <bors@rust-lang.org> | 2024-02-11 13:13:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-11 13:13:02 +0000 |
| commit | 899c895ba4558737d8e3235b5d864d985bf28e95 (patch) | |
| tree | 21de3dee89c538cd4b1a5ddac5d4c05bf1ab6148 /src/ci/scripts/select-xcode.sh | |
| parent | 9aa232ecc7bb006a1fad404f437b049482021a3a (diff) | |
| parent | 4ce1f1cffc7c63928cac447afe8010e6daaa42d6 (diff) | |
| download | rust-899c895ba4558737d8e3235b5d864d985bf28e95.tar.gz rust-899c895ba4558737d8e3235b5d864d985bf28e95.zip | |
Auto merge of #120914 - ehuss:downgrade-xcode, r=Mark-Simulacrum
Downgrade xcode This is a temporary fix for the CI issues that have been plaguing the macOS builders. GitHub updated the default Xcode to 15 in the [2024-02-04](https://github.com/actions/runner-images/releases/tag/macos-13%2F20240204.1) update. This caused two issues to start appearing in CI: * cmake fails to verify that clang can build a simple test program. * An `invalid r_symbolnum` linking error when trying to build one of cranelift's tests. I believe I have a solution for the first problem, but not the second. In the meantime, to help with the CI problems, this PR should temporarily resolve the issue until we have a solution.
Diffstat (limited to 'src/ci/scripts/select-xcode.sh')
| -rwxr-xr-x | src/ci/scripts/select-xcode.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ci/scripts/select-xcode.sh b/src/ci/scripts/select-xcode.sh index 3b9c77d42ba..569c4a4136d 100755 --- a/src/ci/scripts/select-xcode.sh +++ b/src/ci/scripts/select-xcode.sh @@ -7,7 +7,5 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isMacOS; then - if [[ -s "${SELECT_XCODE-}" ]]; then - sudo xcode-select -s "${SELECT_XCODE}" - fi + sudo xcode-select -s "${SELECT_XCODE}" fi |