prepare beta 1.33.0

jethrogb · Jan 16, 2019 · dc25c80 · dc25c80
1 parent cccaf9a
commit dc25c80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
+4 −4		CONTRIBUTING.md
+1 −1		src/cargo/core/resolver/errors.rs
+2 −0		src/doc/man/cargo-package.adoc
+2 −0		src/doc/man/cargo-publish.adoc
+26 −0		src/doc/man/generated/cargo-package.html
+26 −0		src/doc/man/generated/cargo-publish.html
+24 −2		src/etc/man/cargo-package.1
+24 −2		src/etc/man/cargo-publish.1
+2 −2		tests/testsuite/build.rs