diff options
| author | bors <bors@rust-lang.org> | 2024-09-28 10:46:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-28 10:46:56 +0000 |
| commit | 612796c42077605fdd3c6f7dda05745d8f4dc4d8 (patch) | |
| tree | b10950ff038774560499adf434f798f6a1ddfc35 /src/ci/scripts/select-xcode.sh | |
| parent | 150247c338a54cb3d08614d8530d1bb491fa90db (diff) | |
| parent | 5d7db936008110f9760dcf5e74912c6662d2bd4f (diff) | |
| download | rust-612796c42077605fdd3c6f7dda05745d8f4dc4d8.tar.gz rust-612796c42077605fdd3c6f7dda05745d8f4dc4d8.zip | |
Auto merge of #130964 - matthiaskrgr:rollup-suriuub, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #125404 (Fix `read_buf` uses in `std`) - #130866 (Allow instantiating object trait binder when upcasting) - #130922 (Reference UNSPECIFIED instead of INADDR_ANY in join_multicast_v4) - #130924 (Make clashing_extern_declarations considering generic args for ADT field) - #130939 (rustdoc: update `ProcMacro` docs section on helper attributes) - #130940 (Revert space-saving operations) - #130944 (Allow instantiating trait object binder in ptr-to-ptr casts) - #130953 (Rename a few tests to make tidy happier) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts/select-xcode.sh')
| -rwxr-xr-x | src/ci/scripts/select-xcode.sh | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/ci/scripts/select-xcode.sh b/src/ci/scripts/select-xcode.sh index d635d438472..569c4a4136d 100755 --- a/src/ci/scripts/select-xcode.sh +++ b/src/ci/scripts/select-xcode.sh @@ -1,6 +1,5 @@ #!/bin/bash # This script selects the Xcode instance to use. -# It also tries to do some cleanup in CI jobs of unused Xcodes. set -euo pipefail IFS=$'\n\t' @@ -8,21 +7,5 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isMacOS; then - # This additional step is to try to remove an Xcode we aren't using because each one is HUGE - old_xcode="$(xcode-select --print-path)" - old_xcode="${old_xcode%/*}" # pop a dir - old_xcode="${old_xcode%/*}" # twice - if [[ $old_xcode =~ $SELECT_XCODE ]]; then - echo "xcode-select.sh's brutal hack may not be necessary?" - exit 1 - elif [[ $SELECT_XCODE =~ "16" ]]; then - echo "Using Xcode 16? Please fix xcode-select.sh" - exit 1 - fi - if [ $CI ]; then # just in case someone sources this on their real computer - sudo rm -rf "${old_xcode}" - xcode_16="${old_xcode%/*}/Xcode-16.0.0.app" - sudo rm -rf "${xcode_16}" - fi sudo xcode-select -s "${SELECT_XCODE}" fi |
