diff --git a/src/ci/run.sh b/src/ci/run.sh index 44db6b92c95d9..5b1fb676187b1 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -46,7 +46,7 @@ fi # # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. -export RUST_RELEASE_CHANNEL=beta +export RUST_RELEASE_CHANNEL=nightly if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp" diff --git a/src/stage0.txt b/src/stage0.txt index c694667715fad..435cfd2f6db4e 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,9 +12,9 @@ # source tarball for a stable release you'll likely see `1.x.0` for rustc and # `0.x.0` for Cargo where they were released on `date`. -date: 2018-06-20 -rustc: 1.27.0 -cargo: 0.28.0 +date: 2018-05-10 +rustc: beta +cargo: beta # When making a stable release the process currently looks like: # @@ -34,4 +34,4 @@ cargo: 0.28.0 # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -dev: 1 +#dev: 1 diff --git a/src/tools/rust-installer b/src/tools/rust-installer index 89414e44dc948..118e078c5badd 160000 --- a/src/tools/rust-installer +++ b/src/tools/rust-installer @@ -1 +1 @@ -Subproject commit 89414e44dc94844888e59c08bc31dcccb1792800 +Subproject commit 118e078c5badd520d18b92813fd88789c8d341ab