Skip to content

Commit 18aaa1d

Browse files
committed
Auto merge of #49589 - alexcrichton:beta-next, r=alexcrichton
[beta] Prepare the 1.26.0 beta release * Bump the bootstrap compiler to the stable release * Update the channel to beta
2 parents 097efa9 + 09d0a98 commit 18aaa1d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/ci/docker/x86_64-gnu-tools/checktools.sh

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ python2.7 "$X_PY" test --no-fail-fast \
3131
src/doc/rust-by-example \
3232
src/tools/rls \
3333
src/tools/rustfmt \
34-
src/tools/miri \
3534
src/tools/clippy
3635
set -e
3736

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
#
4545
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4646
# either automatically or manually.
47-
export RUST_RELEASE_CHANNEL=nightly
47+
export RUST_RELEASE_CHANNEL=beta
4848
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
4949
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
5050
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"

src/stage0.txt

+3-3
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: 2018-03-18
16-
rustc: beta
17-
cargo: beta
15+
date: 2018-03-29
16+
rustc: 1.25.0
17+
cargo: 0.26.0
1818

1919
# When making a stable release the process currently looks like:
2020
#

0 commit comments

Comments
 (0)