Skip to content

Commit 81a97ce

Browse files
committed
move the current channel to src/ci/channel
This will make it easier for tools to programmatically detect which channel CI is building.
1 parent 109248a commit 81a97ce

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/ci/channel

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nightly

src/ci/run.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,10 @@ if [ "$DIST_SRC" = "" ]; then
6262
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src"
6363
fi
6464

65-
# If we're deploying artifacts then we set the release channel, otherwise if
66-
# we're not deploying then we want to be sure to enable all assertions because
67-
# we'll be running tests
68-
#
69-
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
70-
# either automatically or manually.
71-
export RUST_RELEASE_CHANNEL=nightly
72-
7365
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
7466
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
7567
# master, beta, or stable with a build to determine whether to run some checks (notably toolstate).
68+
export RUST_RELEASE_CHANNEL="$(cat "${ci_dir}/channel")"
7669
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
7770

7871
if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then

0 commit comments

Comments
 (0)