Auto merge of #48183 - Mark-Simulacrum:beta-next, r=kennytm

Beta: bootstrap from 1.24.0 stable. r? @alexcrichton I think this is all correct... not sure about Cargo, but seems fine for now, we can always change later.
rust-lang · Feb 18, 2018 · da1f1b5 · da1f1b5
2 parents c83fa5d + 666d385
commit da1f1b5
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 30 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -24,7 +24,6 @@ set +e
 python2.7 "$X_PY" test --no-fail-fast \
     src/tools/rls \
     src/tools/rustfmt \
-    src/tools/miri \
     src/tools/clippy
 set -e
 

diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -42,7 +42,7 @@ fi
 #
 # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
 #        either automatically or manually.
-export RUST_RELEASE_CHANNEL=nightly
+export RUST_RELEASE_CHANNEL=beta
 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
@@ -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-01-02
-rustc: beta
-cargo: beta
+date: 2018-02-15
+rustc: 1.24.0
+cargo: 0.25.0
 
 # When making a stable release the process currently looks like:
 #

diff --git a/src/tools/cargo b/src/tools/cargo