Skip to content

Commit b7dc83a

Browse files
committed
Auto merge of rust-lang#72917 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] 1.45 from master r? @ghost
2 parents eeaf497 + 5afb70a commit b7dc83a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
#
5252
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
5353
# either automatically or manually.
54-
export RUST_RELEASE_CHANNEL=nightly
54+
export RUST_RELEASE_CHANNEL=beta
5555

5656
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
5757
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting

src/stage0.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.(x+1).0` for Cargo where they were released on `date`.
1414

15-
date: 2020-04-22
16-
rustc: beta
17-
cargo: beta
15+
date: 2020-06-01
16+
rustc: 1.44.0
17+
cargo: 0.45.0
1818

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

2525
# When making a stable release the process currently looks like:
2626
#
@@ -40,4 +40,4 @@ rustfmt: nightly-2020-04-22
4040
# looking at a beta source tarball and it's uncommented we'll shortly comment it
4141
# out.
4242

43-
#dev: 1
43+
dev: 1

0 commit comments

Comments
 (0)