Skip to content

Commit 6ce2ba4

Browse files
committed
Auto merge of #68595 - pietroalbini:beta-next, r=Mark-Simulacrum
[beta] Prepare beta 1.42.0 r? @ghost
2 parents 8201866 + 278984a commit 6ce2ba4

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
@@ -43,7 +43,7 @@ fi
4343
#
4444
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4545
# either automatically or manually.
46-
export RUST_RELEASE_CHANNEL=nightly
46+
export RUST_RELEASE_CHANNEL=beta
4747

4848
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
4949
# 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,14 +12,14 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2019-12-18
16-
rustc: beta
17-
cargo: beta
15+
date: 2020-01-27
16+
rustc: 1.41.0
17+
cargo: 0.42.0
1818

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

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

42-
#dev: 1
42+
dev: 1

0 commit comments

Comments
 (0)