Skip to content

Commit

Permalink
Auto merge of rust-lang#66108 - pietroalbini:beta-next, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

Prepare beta 1.40.0

cc @Mark-Simulacrum
  • Loading branch information
bors committed Nov 5, 2019
2 parents d2185f6 + 73369f3 commit 76b4053
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
13 changes: 12 additions & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,18 @@ impl<'a> Builder<'a> {
// things still build right, please do!
match mode {
Mode::Std => metadata.push_str("std"),
_ => {},
// When we're building rustc tools, they're built with a search path
// that contains things built during the rustc build. For example,
// bitflags is built during the rustc build, and is a dependency of
// rustdoc as well. We're building rustdoc in a different target
// directory, though, which means that Cargo will rebuild the
// dependency. When we go on to build rustdoc, we'll look for
// bitflags, and find two different copies: one built during the
// rustc step and one that we just built. This isn't always a
// problem, somehow -- not really clear why -- but we know that this
// fixes things.
Mode::ToolRustc => metadata.push_str("tool-rustc"),
_ => {}
}
cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);

Expand Down
2 changes: 1 addition & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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" = "1" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
Expand Down
8 changes: 4 additions & 4 deletions src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2019-09-25
rustc: beta
cargo: beta
date: 2019-11-04
rustc: 1.39.0
cargo: 0.40.0

# When making a stable release the process currently looks like:
#
Expand All @@ -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

0 comments on commit 76b4053

Please sign in to comment.