diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-20 07:44:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 07:44:26 -0500 |
| commit | 041bd626ace013f93fa7fe101c70f36543fc9b0d (patch) | |
| tree | 168413e62b75608c9f8873f0b4c8cb51b394542c /python/servo/devenv_commands.py | |
| parent | 5d16c7353a10ddf5521da7c709646d5516bf6db2 (diff) | |
| parent | 404c722920043caf548bf10c0242aac5d22a96b3 (diff) | |
| download | servo-041bd626ace013f93fa7fe101c70f36543fc9b0d.tar.gz servo-041bd626ace013f93fa7fe101c70f36543fc9b0d.zip | |
Auto merge of #18942 - servo:static.rlo, r=jdm,mbrubeck
Bootstrap from more permanent URLs
The `rust-lang-ci` S3 bucket is ephemeral. `static-rust-lang-org.s3.amazonaws.com` is not going away soon, but using `static.rust-lang.org` when possible keeps things working if it ever does.
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.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18942)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/devenv_commands.py')
| -rw-r--r-- | python/servo/devenv_commands.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 5e951bec8cd..e6cb91bd20a 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -23,6 +23,7 @@ from mach.decorators import ( from servo.command_base import CommandBase, cd, call from servo.build_commands import notify_build_done +from servo.util import STATIC_RUST_LANG_ORG_DIST, URLOPEN_KWARGS @CommandProvider @@ -262,8 +263,8 @@ class MachCommands(CommandBase): description='Update the Rust version to latest Nightly', category='devenv') def rustup(self): - url = "https://static-rust-lang-org.s3.amazonaws.com/dist/channel-rust-nightly-date.txt" - nightly_date = urllib2.urlopen(url).read() + url = STATIC_RUST_LANG_ORG_DIST + "/channel-rust-nightly-date.txt" + nightly_date = urllib2.urlopen(url, **URLOPEN_KWARGS).read() filename = path.join(self.context.topdir, "rust-toolchain") with open(filename, "w") as f: f.write("nightly-%s\n" % nightly_date) |