Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Download "non-alt" rustc builds from more permanent URLs

Browse source 
The `rust-lang-ci` S3 bucket is ephemeral:

https://internals.rust-lang.org/t/updates-on-rusts-ci-uploads/6062
https://internals.rust-lang.org/t/public-stable-rust-services/6072

We’ll still need to find a solution for "alt" rustc builds.
In the meantime, this is a step.
This commit is contained in:
Simon Sapin 2017-10-18 18:24:45 +02:00
parent 421baa854e
commit efdaa0d00a
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/servo/bootstrap_commands.py
View file

@ -88,15 +88,14 @@ class MachCommands(CommandBase):
# in that directory). # in that directory).
if stable: if stable:
base_url = static_s3 base_url = static_s3
else: elif not self.config["build"]["llvm-assertions"]:
import toml import toml
channel = "%s/%s/channel-rust-nightly.toml" % (static_s3, self.rust_nightly_date()) channel = "%s/%s/channel-rust-nightly.toml" % (static_s3, self.rust_nightly_date())
nightly_commit_hash = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["git_commit_hash"] nightly_commit_hash = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["git_commit_hash"]
base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds-alt/" + nightly_commit_hash
if not self.config["build"]["llvm-assertions"]: else:
base_url += "-alt" base_url = "%s/%s" % (static_s3, self.rust_nightly_date())
base_url += "/" + nightly_commit_hash
rustc_url = base_url + "/rustc-%s-%s.tar.gz" % (version, host_triple()) rustc_url = base_url + "/rustc-%s-%s.tar.gz" % (version, host_triple())
tgz_file = rust_dir + '-rustc.tar.gz' tgz_file = rust_dir + '-rustc.tar.gz'