about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2020-08-25 23:04:02 +0200
committerPietro Albini <pietro@pietroalbini.org>2020-08-25 23:04:02 +0200
commitca26640e7f47fdeb18e54e6837ad0c56c05117fd (patch)
treef261ba695eb9ad8933e63e6c881af989f4720554
parent8ba22504e8e5dcbbe136d97f63c1280dabc523d0 (diff)
this is beta 1.47.0
-rwxr-xr-xsrc/ci/run.sh2
-rw-r--r--src/stage0.txt10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 5231aa2e766..36df39c9490 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -63,7 +63,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
 
 # Always set the release channel for bootstrap; this is normally not important (i.e., only dist
 # builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
diff --git a/src/stage0.txt b/src/stage0.txt
index 4234ce4bac0..ab9da4dd822 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,15 +12,15 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.(x+1).0` for Cargo where they were released on `date`.
 
-date: 2020-07-16
-rustc: beta
-cargo: beta
+date: 2020-08-24
+rustc: 1.46.0
+cargo: 0.47.0
 
 # We use a nightly rustfmt to format the source because it solves some
 # bootstrapping issues with use of new syntax in this repo. If you're looking at
 # the beta/stable branch, this key should be omitted, as we don't want to depend
 # on rustfmt from nightly there.
-rustfmt: nightly-2020-07-12
+#rustfmt: nightly-2020-07-12
 
 # When making a stable release the process currently looks like:
 #
@@ -40,4 +40,4 @@ rustfmt: nightly-2020-07-12
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-#dev: 1
+dev: 1