From 555366d6d18bbf34c6f0b8773ca1b4ef0da34345 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 2 Apr 2018 08:36:37 -0700 Subject: [PATCH 1/2] [beta] Prepare the 1.26.0 beta release * Bump the bootstrap compiler to the stable release * Update the channel to beta --- src/ci/run.sh | 2 +- src/stage0.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index 44eae0d180047..74db27a207ba8 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -44,7 +44,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 index 96ec1e6834dff..11c5cc658164d 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-03-18 -rustc: beta -cargo: beta +date: 2018-03-29 +rustc: 1.25.0 +cargo: 0.26.0 # When making a stable release the process currently looks like: # From 09d0a980d65f87fbfb69a82cc2c2e2b781a2fbbe Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 2 Apr 2018 15:39:04 -0700 Subject: [PATCH 2/2] Don't verify miri's build status on beta --- src/ci/docker/x86_64-gnu-tools/checktools.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index da89aa9423b2d..f5b4549075ad9 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -31,7 +31,6 @@ python2.7 "$X_PY" test --no-fail-fast \ src/doc/rust-by-example \ src/tools/rls \ src/tools/rustfmt \ - src/tools/miri \ src/tools/clippy set -e