diff options
| author | bors <bors@rust-lang.org> | 2019-01-17 05:00:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-17 05:00:14 +0000 |
| commit | 722b4d695964906807b12379577bce5ee3d23e08 (patch) | |
| tree | b347115ede095d9266fb17f12a52ce980735cb8e /src/ci | |
| parent | 956dba47d33fc8b2bdabcd50e5bfed264b570382 (diff) | |
| parent | b54a00accdadc9d98571050888dab701ca7bd2fd (diff) | |
| download | rust-722b4d695964906807b12379577bce5ee3d23e08.tar.gz rust-722b4d695964906807b12379577bce5ee3d23e08.zip | |
Auto merge of #57670 - rust-lang:beta-next, r=Mark-Simulacrum
Prepare beta 1.33.0 This PR includes the usual changes for a new beta, and suppresses a few lints on libcore: those lints are false positives caused by an internal attribute (`rustc_layout_scalar_valid_range_start`) and only happen on stage0. r? @Mark-Simulacrum
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index b0e1b165105..b7e81762559 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -43,7 +43,7 @@ fi # # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. -export RUST_RELEASE_CHANNEL=nightly +export RUST_RELEASE_CHANNEL=beta if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp" |