Skip to content

Commit 03fb2f4

Browse files
committed
Auto merge of #50522 - alexcrichton:beta-next, r=alexcrichton
[beta] Prepare the 1.27.0 beta release This commit prepares the 1.27.0 beta release by doing: * Update the release channel to `beta` * Update Cargo's submodule * Update `stdsimd`'s submodule * Update the bootstrap compiler to the freshly minted 1.26.0 stable release
2 parents 715d6a9 + 4d4e96d commit 03fb2f4

File tree

9 files changed

+66
-57
lines changed

9 files changed

+66
-57
lines changed

src/Cargo.lock

+56-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/tool.rs

-9
Original file line numberDiff line numberDiff line change
@@ -556,15 +556,6 @@ tool_extended!((self, builder),
556556
};
557557
Miri, miri, "src/tools/miri", "miri", {};
558558
Rls, rls, "src/tools/rls", "rls", {
559-
let clippy = builder.ensure(Clippy {
560-
compiler: self.compiler,
561-
target: self.target,
562-
extra_features: Vec::new(),
563-
});
564-
let channel = &builder.config.channel;
565-
if clippy.is_some() && channel != "stable" && channel != "beta" {
566-
self.extra_features.push("clippy".to_owned());
567-
}
568559
builder.ensure(native::Openssl {
569560
target: self.target,
570561
});

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ python2.7 "$X_PY" test --no-fail-fast \
3030
src/doc/reference \
3131
src/doc/rust-by-example \
3232
src/tools/rls \
33-
src/tools/rustfmt \
34-
src/tools/miri \
35-
src/tools/clippy
33+
src/tools/rustfmt
3634
set -e
3735

3836
cat "$TOOLSTATE_FILE"
@@ -66,8 +64,6 @@ verify_status reference src/doc/reference
6664
verify_status rust-by-example src/doc/rust-by-example
6765
verify_status rls src/tool/rls
6866
verify_status rustfmt src/tool/rustfmt
69-
verify_status clippy-driver src/tool/clippy
70-
verify_status miri src/tool/miri
7167

7268
if [ "$RUST_RELEASE_CHANNEL" = nightly -a -n "${TOOLSTATE_REPO_ACCESS_TOKEN+is_set}" ]; then
7369
. "$(dirname $0)/repo.sh"

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fi
4848
#
4949
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
5050
# either automatically or manually.
51-
export RUST_RELEASE_CHANNEL=nightly
51+
export RUST_RELEASE_CHANNEL=beta
5252
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
5353
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
5454
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: 2018-04-24
16-
rustc: beta
17-
cargo: beta
15+
date: 2018-05-07
16+
rustc: 1.26.0
17+
cargo: 0.27.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

src/stdsimd

src/tools/cargo

Submodule cargo updated 57 files

src/tools/rls

Submodule rls updated from d2f4435 to d2ade31

src/tools/rustfmt

0 commit comments

Comments
 (0)