diff options
| -rw-r--r-- | src/ci/channel | 1 | ||||
| -rwxr-xr-x | src/ci/run.sh | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/ci/channel b/src/ci/channel new file mode 100644 index 00000000000..bf867e0ae5b --- /dev/null +++ b/src/ci/channel @@ -0,0 +1 @@ +nightly diff --git a/src/ci/run.sh b/src/ci/run.sh index 1958b6ee41d..35f80a935c6 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -62,17 +62,10 @@ if [ "$DIST_SRC" = "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src" fi -# If we're deploying artifacts then we set the release channel, otherwise if -# we're not deploying then we want to be sure to enable all assertions because -# we'll be running tests -# -# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` -# either automatically or manually. -export RUST_RELEASE_CHANNEL=nightly - # 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). +export RUST_RELEASE_CHANNEL="$(cat "${ci_dir}/channel")" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL" if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then |