File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ set -euo pipefail
7
7
IFS=$' \n\t '
8
8
9
9
RUSTC_REPO=" https://github.com/rust-lang/rust"
10
- RUSTC_DEFAULT_BRANCH=" master"
11
10
12
11
# CDN to download CI artifacts from.
13
12
DOWNLOAD_BASE=" https://ci-artifacts.rust-lang.org/rustc-builds"
@@ -47,17 +46,17 @@ override_commit="$2"
47
46
48
47
# Nightly is on the default branch
49
48
if [[ " ${channel} " = " nightly" ]]; then
50
- branch=" ${RUSTC_DEFAULT_BRANCH} "
49
+ branch=" HEAD "
51
50
else
52
- branch=" ${channel} "
51
+ branch=" refs/heads/ ${channel} "
53
52
fi
54
53
55
54
echo " ==> overriding files to force promote-release to run"
56
55
mc cp " /src/local/channel-rust-${channel} .toml" " local/static/dist/channel-rust-${channel} .toml" > /dev/null
57
56
58
57
if [[ " ${override_commit} " = " " ]]; then
59
58
echo " ==> detecting the last rustc commit on branch ${branch} "
60
- commit=" $( git ls-remote " ${RUSTC_REPO} " | grep " refs/heads/ ${branch} " | awk ' {print($1)}' ) "
59
+ commit=" $( git ls-remote " ${RUSTC_REPO} " " ${branch} " | awk ' {print($1)}' ) "
61
60
else
62
61
echo " =>> using overridden commit ${override_commit} "
63
62
commit=" ${override_commit} "
You can’t perform that action at this time.
0 commit comments