Skip to content

Commit

Permalink
Auto merge of #51680 - Mark-Simulacrum:acc-revert, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Revert #51662

This reverts that PR because it was never intended to merge into the master branch.
  • Loading branch information
bors committed Jun 21, 2018
2 parents e11c95d + 43557fc commit f790780
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fi
#
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
# either automatically or manually.
export RUST_RELEASE_CHANNEL=beta
export RUST_RELEASE_CHANNEL=nightly
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"
Expand Down
8 changes: 4 additions & 4 deletions src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
# `0.x.0` for Cargo where they were released on `date`.

date: 2018-06-20
rustc: 1.27.0
cargo: 0.28.0
date: 2018-05-10
rustc: beta
cargo: beta

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

dev: 1
#dev: 1
2 changes: 1 addition & 1 deletion src/tools/rust-installer

0 comments on commit f790780

Please sign in to comment.