From 842a9061ea612d36e5d546c6afb36cf9e054c909 Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Wed, 20 Jun 2018 07:48:06 -0600 Subject: [PATCH 1/2] [beta] Prepare 1.28.0 beta release --- src/ci/run.sh | 2 +- src/stage0.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index 5b1fb676187b1..44db6b92c95d9 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=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 435cfd2f6db4e..c694667715fad 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-05-10 -rustc: beta -cargo: beta +date: 2018-06-20 +rustc: 1.27.0 +cargo: 0.28.0 # When making a stable release the process currently looks like: # @@ -34,4 +34,4 @@ cargo: beta # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -#dev: 1 +dev: 1 From 09a0bc7975c1d9a98177f3e5037e67765e3b44dc Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Wed, 20 Jun 2018 17:04:54 -0600 Subject: [PATCH 2/2] Fix error-chain warnings --- src/tools/rust-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rust-installer b/src/tools/rust-installer index 118e078c5badd..89414e44dc948 160000 --- a/src/tools/rust-installer +++ b/src/tools/rust-installer @@ -1 +1 @@ -Subproject commit 118e078c5badd520d18b92813fd88789c8d341ab +Subproject commit 89414e44dc94844888e59c08bc31dcccb1792800