about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-01-16 17:18:44 +0100
committerPietro Albini <pietro@pietroalbini.org>2019-01-16 17:22:51 +0100
commitdc25c80571bf2a9f27d67f9d62c2be72d9c1c6ea (patch)
tree3c2034b24d9abd8ebc9f3c7345dfb15396e490d6
parentcccaf9a8c69219c8267e406f92fef895fbba80f2 (diff)
downloadrust-dc25c80571bf2a9f27d67f9d62c2be72d9c1c6ea.tar.gz
rust-dc25c80571bf2a9f27d67f9d62c2be72d9c1c6ea.zip
prepare beta 1.33.0
-rwxr-xr-xsrc/ci/run.sh2
-rw-r--r--src/stage0.txt8
m---------src/tools/cargo0
3 files changed, 5 insertions, 5 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"
diff --git a/src/stage0.txt b/src/stage0.txt
index 2e376ed1ced..0983add49ca 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -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: 2019-01-04
-rustc: beta
-cargo: beta
+date: 2019-01-16
+rustc: 1.32.0
+cargo: 0.33.0
 
 # When making a stable release the process currently looks like:
 #
@@ -34,4 +34,4 @@ cargo: beta
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-#dev: 1
+dev: 1
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 2b4a5f1f0bb6e13759e88ea9512527b0beba154
+Subproject 9b5d4b755617d60dd841912b354be8a6b6b3849