Skip to content

Commit

Permalink
Auto merge of #68595 - pietroalbini:beta-next, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
[beta] Prepare beta 1.42.0

r? @ghost
  • Loading branch information
bors committed Jan 29, 2020
2 parents 8201866 + 278984a commit 6ce2ba4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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

# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
Expand Down
10 changes: 5 additions & 5 deletions src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
# 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-12-18
rustc: beta
cargo: beta
date: 2020-01-27
rustc: 1.41.0
cargo: 0.42.0

# We use a nightly rustfmt to format the source because it solves some bootstrapping
# issues with use of new syntax in this repo. If you're looking at the beta/stable branch, this key should be omitted,
# as we don't want to depend on rustfmt from nightly there.
rustfmt: nightly-2019-12-18
#rustfmt: nightly-2019-12-18

# When making a stable release the process currently looks like:
#
Expand All @@ -39,4 +39,4 @@ rustfmt: nightly-2019-12-18
# looking at a beta source tarball and it's uncommented we'll shortly comment it
# out.

#dev: 1
dev: 1
2 changes: 1 addition & 1 deletion src/tools/rustfmt

0 comments on commit 6ce2ba4

Please sign in to comment.