From 89691f513d4d33bab91896d6422c8b00799e670b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 31 Jan 2017 14:02:10 -0800 Subject: [PATCH 1/2] Revert "Bump to 1.17" This reverts commit 61fd92c04af02789dd76cf74ce283628bafdea37. --- mk/main.mk | 2 +- src/ci/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/main.mk b/mk/main.mk index 6b409eebc74c8..9cd30be6531d1 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -13,7 +13,7 @@ ###################################################################### # The version number -CFG_RELEASE_NUM=1.17.0 +CFG_RELEASE_NUM=1.16.0 # An optional number to put after the label, e.g. '.2' -> '-beta.2' # NB Make sure it starts with a dot to conform to semver pre-release diff --git a/src/ci/run.sh b/src/ci/run.sh index 5f0abb02cc784..3a2cc47df79bf 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -29,7 +29,7 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. if [ "$DEPLOY" != "" ]; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta" + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp" if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then From 26665f3c9984eed666ab5161dacd6dc0b5e74044 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 31 Jan 2017 14:03:07 -0800 Subject: [PATCH 2/2] Update beta configs * Bootstrap beta from the newly minted stable release * Update the Cargo to match the 1.16.0 release --- src/ci/run.sh | 2 +- src/stage0.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index 3a2cc47df79bf..5f0abb02cc784 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -29,7 +29,7 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. if [ "$DEPLOY" != "" ]; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly" + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp" if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then diff --git a/src/stage0.txt b/src/stage0.txt index 4be9e3e57baac..1235fec0c699a 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,5 +12,5 @@ # tarball for a stable release you'll likely see `1.x.0-$date` where `1.x.0` was # released on `$date` -rustc: beta-2016-12-20 -cargo: bfee18f73287687c543bda8c35e4e33808792715 +rustc: 1.15.0-2017-01-31 +cargo: 6e0c18cccc8b0c06fba8a8d76486f81a792fb420