Skip to content

Commit

Permalink
Auto merge of #41580 - alexcrichton:update-beta-bootstrap, r=brson
Browse files Browse the repository at this point in the history
[beta] Bootstrap beta from the real stable compiler

Routine update from the dev-static urls to the static urls, updating dates as
well. Should be the same artifacts.
  • Loading branch information
bors committed Apr 29, 2017
2 parents 4dce672 + b526b22 commit d4e107d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def download_stage0(self):
if os.path.exists(self.bin_root()):
shutil.rmtree(self.bin_root())
filename = "rust-std-{}-{}.tar.gz".format(channel, self.build)
url = "https://dev-static.rust-lang.org/dist/" + self.stage0_rustc_date()
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
tarball = os.path.join(rustc_cache, filename)
if not os.path.exists(tarball):
get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
Expand All @@ -180,7 +180,7 @@ def download_stage0(self):
verbose=self.verbose)

filename = "rustc-{}-{}.tar.gz".format(channel, self.build)
url = "https://dev-static.rust-lang.org/dist/" + self.stage0_rustc_date()
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
tarball = os.path.join(rustc_cache, filename)
if not os.path.exists(tarball):
get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
Expand All @@ -192,7 +192,7 @@ def download_stage0(self):

if "pc-windows-gnu" in self.build:
filename = "rust-mingw-{}-{}.tar.gz".format(channel, self.build)
url = "https://dev-static.rust-lang.org/dist/" + self.stage0_rustc_date()
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
tarball = os.path.join(rustc_cache, filename)
if not os.path.exists(tarball):
get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
Expand All @@ -202,7 +202,7 @@ def download_stage0(self):
(not os.path.exists(self.cargo()) or self.cargo_out_of_date()):
self.print_what_it_means_to_bootstrap()
filename = "cargo-{}-{}.tar.gz".format('0.18.0', self.build)
url = "https://dev-static.rust-lang.org/dist/" + self.stage0_rustc_date()
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
tarball = os.path.join(rustc_cache, filename)
if not os.path.exists(tarball):
get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
Expand Down
2 changes: 1 addition & 1 deletion src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# tarball for a stable release you'll likely see `1.x.0-$date` where `1.x.0` was
# released on `$date`

rustc: 1.17.0-2017-04-25
rustc: 1.17.0-2017-04-27

0 comments on commit d4e107d

Please sign in to comment.