From e11100d524f67e149729d40bc9efbae769c7beb4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 Nov 2017 15:52:11 -0800 Subject: [PATCH 1/2] [beta] Prepare the 1.23.0 beta release * Update the release channel config * Update the bootstrap compiler to the dev stable build * Update the cargo submodule to its master branch --- src/ci/run.sh | 2 +- src/stage0.txt | 8 ++++---- src/tools/cargo | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index a8a7dd5bc27aa..ba37e6aee55b1 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -43,7 +43,7 @@ fi # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. if [ "$DEPLOY$DEPLOY_ALT" != "" ]; 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 6b3aaf2deb264..bcef242057ee4 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: 2017-10-20 -rustc: beta -cargo: beta +date: 2017-11-20 +rustc: 1.22.0 +cargo: 0.23.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 diff --git a/src/tools/cargo b/src/tools/cargo index abd137ad14a8f..6a1aee06680d8 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit abd137ad14a8f352b48f24b11c3995d716deb260 +Subproject commit 6a1aee06680d8f074a25431c938c42d7e8d0ab4e From af4a78bb9d62ac0d86f1ac166e7eaa08517a7fa2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 Nov 2017 06:30:49 -0800 Subject: [PATCH 2/2] rustbuild: Allow using unstable rustdoc features on beta I believe this was forgotten from #45191 but hopefully is a simple fix! --- src/bootstrap/builder.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index b202df76f7c85..c76900882b6dd 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -419,7 +419,8 @@ impl<'a> Builder<'a> { .env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build)) .env("CFG_RELEASE_CHANNEL", &self.build.config.channel) .env("RUSTDOC_REAL", self.rustdoc(host)) - .env("RUSTDOC_CRATE_VERSION", self.build.rust_version()); + .env("RUSTDOC_CRATE_VERSION", self.build.rust_version()) + .env("RUSTC_BOOTSTRAP", "1"); if let Some(linker) = self.build.linker(host) { cmd.env("RUSTC_TARGET_LINKER", linker); }