Auto merge of #86662 - mockersf:fix-86620-link-unknown-location, r=jyn514

[rust.git] / src / ci / run.sh

diff --git a/src/ci/run.sh b/src/ci/run.sh
index c5e225c7cd17df61bb3e49051c7002a4b6f0383a..b5019d83af45b426e424dd312d068145761398aa 100755 (executable)
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -65,11 +65,7 @@ fi
 # Always set the release channel for bootstrap; this is normally not important (i.e., only dist
 # builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
 # master, beta, or stable with a build to determine whether to run some checks (notably toolstate).
-if [[ -z "${RUST_CI_OVERRIDE_RELEASE_CHANNEL+x}" ]]; then
-    export RUST_RELEASE_CHANNEL="$(cat "${ci_dir}/channel")"
-else
-    export RUST_RELEASE_CHANNEL="${RUST_CI_OVERRIDE_RELEASE_CHANNEL}"
-fi
+export RUST_RELEASE_CHANNEL=$(releaseChannel)
 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
 
 if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then