diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-10-18 18:24:45 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-10-18 19:20:29 +0200 |
| commit | efdaa0d00ac286b4dc5ad8d31e68c98a079b8917 (patch) | |
| tree | 2d4b00a395b410a270730eb2cc72e139810116a3 /python/servo/bootstrap_commands.py | |
| parent | 421baa854ea40c7b1a3d1e75acac14da04a3fbcc (diff) | |
| download | servo-efdaa0d00ac286b4dc5ad8d31e68c98a079b8917.tar.gz servo-efdaa0d00ac286b4dc5ad8d31e68c98a079b8917.zip | |
Download "non-alt" rustc builds from more permanent URLs
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.
Diffstat (limited to 'python/servo/bootstrap_commands.py')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 5d09fadb806..bb5e122dc48 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -88,15 +88,14 @@ class MachCommands(CommandBase): # in that directory). if stable: base_url = static_s3 - else: + elif not self.config["build"]["llvm-assertions"]: import toml 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"] - base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" - if not self.config["build"]["llvm-assertions"]: - base_url += "-alt" - base_url += "/" + nightly_commit_hash + base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds-alt/" + nightly_commit_hash + else: + base_url = "%s/%s" % (static_s3, self.rust_nightly_date()) rustc_url = base_url + "/rustc-%s-%s.tar.gz" % (version, host_triple()) tgz_file = rust_dir + '-rustc.tar.gz' |