Skip to content

Commit abadc70

Browse files
Write file with channel to S3
This will let rustup-toolchain-install-master gain support for installing stable artifacts, which is currently only possible when explicitly overriding the channel. That in turn will unblock letting Crater kick off a beta run as soon as both a new beta and a new stable artifact are ready, rather than waiting until the actual release.
1 parent b53da99 commit abadc70

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/ci/scripts/upload-artifacts.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
set -euo pipefail
77
IFS=$'\n\t'
88

9+
ci_dir=`cd $(dirname $0)/.. && pwd`
910
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1011

1112
upload_dir="$(mktemp -d)"
@@ -22,6 +23,15 @@ if [[ "${DEPLOY-0}" -eq "1" ]] || [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then
2223
mv "${dist_dir}"/* "${upload_dir}"
2324
fi
2425

26+
# We write the release channel into the output so that
27+
# `rustup-toolchain-install-master` or other, similar, tools can automatically
28+
# detect the appropriate name to use for downloading artifacts.
29+
#
30+
# For nightly and beta this isn't strictly necessary as just trying both is
31+
# enough, but stable builds produce artifacts with a version (e.g.,
32+
# rust-src-1.92.0.tar.xz) which can't be easily guessed otherwise.
33+
releaseChannel > "${upload_dir}/channel"
34+
2535
# CPU usage statistics.
2636
cp build/cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv"
2737

0 commit comments

Comments
 (0)