diff options
| -rw-r--r-- | src/bootstrap/builder.rs | 3 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 | ||||
| -rw-r--r-- | src/stage0.txt | 8 | ||||
| m--------- | src/tools/cargo | 0 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index b202df76f7c..c76900882b6 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); } diff --git a/src/ci/run.sh b/src/ci/run.sh index a8a7dd5bc27..ba37e6aee55 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 6b3aaf2deb2..bcef242057e 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 -Subproject abd137ad14a8f352b48f24b11c3995d716deb26 +Subproject 6a1aee06680d8f074a25431c938c42d7e8d0ab4 |