nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #130940 - workingjubilee:remove-space-saving-operations, r=Kobzol

Browse Source 
Revert space-saving operations

The "all of our artifacts" `mv` seems like it may save enough space to matter sometimes, since it can range up to a gigabyte of difference, if memory serves. For the rest, I think we're good.

try-job: dist-aarch64-apple
This commit is contained in:
Matthias Krüger 2024-09-28 09:35:11 +02:00 committed by GitHub
commit 6b5cd4e84e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ci/scripts/select-xcode.sh
View File

@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
# This script selects the Xcode instance to use. # This script selects the Xcode instance to use.
# It also tries to do some cleanup in CI jobs of unused Xcodes.
set -euo pipefail set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'
@ -8,21 +7,5 @@ IFS=$'\n\t'
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
if isMacOS; then 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}" sudo xcode-select -s "${SELECT_XCODE}"
fi fi

6
src/ci/scripts/upload-artifacts.sh
View File

@ -23,14 +23,14 @@ if [[ "${DEPLOY-0}" -eq "1" ]] || [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then
fi fi
# CPU usage statistics. # CPU usage statistics.
mv build/cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv" cp build/cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv"
# Build metrics generated by x.py. # Build metrics generated by x.py.
mv "${build_dir}/metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json" cp "${build_dir}/metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json"
# Toolstate data. # Toolstate data.
if [[ -n "${DEPLOY_TOOLSTATES_JSON+x}" ]]; then if [[ -n "${DEPLOY_TOOLSTATES_JSON+x}" ]]; then
mv /tmp/toolstate/toolstates.json "${upload_dir}/${DEPLOY_TOOLSTATES_JSON}" cp /tmp/toolstate/toolstates.json "${upload_dir}/${DEPLOY_TOOLSTATES_JSON}"
fi fi
echo "Files that will be uploaded:" echo "Files that will be uploaded:"