Skip to content

Commit 3a5d62b

Browse files
committed
Auto merge of #60999 - pietroalbini:beta-next, r=pietroalbini
[beta] Prepare beta 1.36.0 cc @rust-lang/release r? @ghost
2 parents 46ad3e1 + 0640334 commit 3a5d62b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
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
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
4848
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
4949
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"

src/stage0.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
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-04-11
16-
rustc: beta
17-
cargo: beta
15+
date: 2019-05-20
16+
rustc: 1.35.0
17+
cargo: 0.36.0
1818

1919
# When making a stable release the process currently looks like:
2020
#
@@ -34,4 +34,4 @@ cargo: beta
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
#dev: 1
37+
dev: 1

0 commit comments

Comments
 (0)