diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2017-02-15 11:08:00 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-02-15 14:55:02 +0100 |
| commit | 336e6c8f286be636a105af858cac18b4d42c1b12 (patch) | |
| tree | 66031bb09ee88536a93ff283f28172a3d655789f /python/servo | |
| parent | 216a89f7766dd366c4afbeae42cf6e1fb4f67349 (diff) | |
| download | servo-336e6c8f286be636a105af858cac18b4d42c1b12.tar.gz servo-336e6c8f286be636a105af858cac18b4d42c1b12.zip | |
Switch to commit-specific nightlies
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 5 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 8975f174d84..ee29bce06db 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -86,9 +86,10 @@ class MachCommands(CommandBase): # in that directory). if stable: tarball = "rustc-%s-%s.tar.gz" % (version, host_triple()) + rustc_url = "https://static-rust-lang-org.s3.amazonaws.com/dist/" + tarball else: tarball = "%s/rustc-nightly-%s.tar.gz" % (version, host_triple()) - rustc_url = "https://static-rust-lang-org.s3.amazonaws.com/dist/" + tarball + rustc_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds/" + tarball tgz_file = rust_dir + '-rustc.tar.gz' download_file("Rust compiler", rustc_url, tgz_file) @@ -126,7 +127,7 @@ class MachCommands(CommandBase): % (version, target_triple)) tgz_file = install_dir + ('rust-std-%s-%s.tar.gz' % (version, target_triple)) else: - std_url = ("https://static-rust-lang-org.s3.amazonaws.com/dist/%s/rust-std-nightly-%s.tar.gz" + std_url = ("https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/rust-std-nightly-%s.tar.gz" % (version, target_triple)) tgz_file = install_dir + ('rust-std-nightly-%s.tar.gz' % target_triple) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 3169e9c9d6a..d533fa44bb8 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -303,7 +303,7 @@ class CommandBase(object): def rust_version(self): if self._rust_version is None or self._use_stable_rust != self._rust_version_is_stable: filename = path.join(self.context.topdir, - "rust-stable-version" if self._use_stable_rust else "rust-nightly-date") + "rust-stable-version" if self._use_stable_rust else "rust-commit-hash") with open(filename) as f: self._rust_version = f.read().strip() return self._rust_version |