Auto merge of rust-lang#129797 - workingjubilee:cleanup-apple-ci, r=<try>

Hunt down The Fruit Company's latest release

I expect this to be... tedious.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc

Author: bors

src/ci/scripts/select-xcode.sh

@@ -1,11 +1,24 @@
 #!/bin/bash
 # This script selects the Xcode instance to use.
 
-set -euo pipefail
+set -euox pipefail
 IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isMacOS; then
+    old_xcode="$(xcode-select --print-path)"
+    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
+    else
+        sudo xcode-select -s 16
+        xcode_16_path="$(xcode-select --print-path)"
+        sudo rm -rf "${xcode_16_path}/../../"
+    fi
+    sudo rm -rf "${old_xcode}/../../"
     sudo xcode-select -s "${SELECT_XCODE}"
 fi

src/ci/scripts/upload-artifacts.sh

@@ -19,18 +19,18 @@ fi
 if [[ "${DEPLOY-0}" -eq "1" ]] || [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then
     dist_dir="${build_dir}/dist"
     rm -rf "${dist_dir}/doc"
-    cp -r "${dist_dir}"/* "${upload_dir}"
+    mv -r "${dist_dir}"/* "${upload_dir}"
 fi
 
 # CPU usage statistics.
-cp build/cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv"
+mv build/cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv"
 
 # Build metrics generated by x.py.
-cp "${build_dir}/metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json"
+mv "${build_dir}/metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json"
 
 # Toolstate data.
 if [[ -n "${DEPLOY_TOOLSTATES_JSON+x}" ]]; then
-    cp /tmp/toolstate/toolstates.json "${upload_dir}/${DEPLOY_TOOLSTATES_JSON}"
+    mv /tmp/toolstate/toolstates.json "${upload_dir}/${DEPLOY_TOOLSTATES_JSON}"
 fi
 
 echo "Files that will be uploaded:"
@@ -55,7 +55,7 @@ then
   echo "# CI artifacts" >> "${GITHUB_STEP_SUMMARY}"
 
   for filename in "${upload_dir}"/*.xz; do
-    filename=`basename "${filename}"`
+    filename=$(basename "${filename}")
     echo "- [${filename}](${access_url}/${filename})" >> "${GITHUB_STEP_SUMMARY}"
   done
 fi