Skip to content

Commit

Permalink
Auto merge of rust-lang#72917 - Mark-Simulacrum:beta-next, r=Mark-Sim…
Browse files Browse the repository at this point in the history
…ulacrum

[beta] 1.45 from master

r? @ghost
  • Loading branch information
bors committed Jun 3, 2020
2 parents eeaf497 + 5afb70a commit b7dc83a
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 @@ -51,7 +51,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,15 +12,15 @@
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
# `0.(x+1).0` for Cargo where they were released on `date`.

date: 2020-04-22
rustc: beta
cargo: beta
date: 2020-06-01
rustc: 1.44.0
cargo: 0.45.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-2020-04-22
#rustfmt: nightly-2020-04-22

# When making a stable release the process currently looks like:
#
Expand All @@ -40,4 +40,4 @@ rustfmt: nightly-2020-04-22
# 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 b7dc83a

Please sign in to comment.