servo: Merge #14397 - Upgrade to cargo 0.16.0-nightly (built 2016-12-06) (from servo:cargoup); r=SimonSapin
authorSimon Sapin <simon.sapin@exyr.org>
Tue, 06 Dec 2016 15:42:30 -0800
changeset 340352 9d983fda55f42e837de30c159c61524c2e2853db
parent 340351 d98492d1d7ed52e96c4da357476c7a39bc17ff4a
child 340353 66a23e3335fd179dc1efbf1e6c5fab03ee225212
push id86548
push userkwierso@gmail.com
push dateSat, 04 Feb 2017 01:35:21 +0000
treeherdermozilla-inbound@e7b96d015d03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersSimonSapin
servo: Merge #14397 - Upgrade to cargo 0.16.0-nightly (built 2016-12-06) (from servo:cargoup); r=SimonSapin <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: e2d956eb62f35e6646501b058296da33ca96fe00
servo/appveyor.yml
servo/cargo-commit-hash
servo/cargo-nightly-build
servo/python/servo/bootstrap_commands.py
servo/python/servo/command_base.py
--- a/servo/appveyor.yml
+++ b/servo/appveyor.yml
@@ -34,18 +34,18 @@ environment:
 branches:
   only:
     - master
 
 platform:
   - x64
 
 cache:
-  - .servo -> rust-nightly-date, cargo-nightly-build
-  - .cargo -> rust-nightly-date, cargo-nightly-build
+  - .servo -> rust-nightly-date, cargo-commit-hash
+  - .cargo -> rust-nightly-date, cargo-commit-hash
 
 install:
   - if %TARGET:*-msvc=msvc%==msvc set BUILD_ENV=msvc
   - if %TARGET:*-gnu=gnu%==gnu set BUILD_ENV=gnu
   - if %BUILD_ENV%==gnu  set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%
   - if %BUILD_ENV%==gnu  set MSYSTEM=MINGW64
   - if %BUILD_ENV%==gnu  set MSYS=winsymlinks=lnk
   - if %BUILD_ENV%==gnu  bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors"
new file mode 100644
--- /dev/null
+++ b/servo/cargo-commit-hash
@@ -0,0 +1,1 @@
+5e3221eac240f1e2c719524ea3c15fde9329dec2
deleted file mode 100644
--- a/servo/cargo-nightly-build
+++ /dev/null
@@ -1,1 +0,0 @@
-2016-10-27
--- a/servo/python/servo/bootstrap_commands.py
+++ b/servo/python/servo/bootstrap_commands.py
@@ -290,17 +290,17 @@ class MachCommands(CommandBase):
             print("Use |bootstrap-cargo --force| to download again.")
             return
 
         if path.isdir(cargo_dir):
             shutil.rmtree(cargo_dir)
         os.makedirs(cargo_dir)
 
         tgz_file = "cargo-nightly-%s.tar.gz" % host_triple()
-        nightly_url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/%s/%s" % \
+        nightly_url = "https://s3.amazonaws.com/rust-lang-ci/cargo-builds/%s/%s" % \
             (self.cargo_build_id(), tgz_file)
 
         download_file("Cargo nightly", nightly_url, tgz_file)
 
         print("Extracting Cargo nightly...")
         nightly_dir = path.join(cargo_dir,
                                 path.basename(tgz_file).replace(".tar.gz", ""))
         extract(tgz_file, cargo_dir, movedir=nightly_dir)
--- a/servo/python/servo/command_base.py
+++ b/servo/python/servo/command_base.py
@@ -331,17 +331,17 @@ class CommandBase(object):
             filename = path.join(self.context.topdir,
                                  "rust-stable-version" if self._use_stable_rust else "rust-nightly-date")
             with open(filename) as f:
                 self._rust_version = f.read().strip()
         return self._rust_version
 
     def cargo_build_id(self):
         if self._cargo_build_id is None:
-            filename = path.join(self.context.topdir, "cargo-nightly-build")
+            filename = path.join(self.context.topdir, "cargo-commit-hash")
             with open(filename) as f:
                 self._cargo_build_id = f.read().strip()
         return self._cargo_build_id
 
     def get_top_dir(self):
         return self.context.topdir
 
     def get_target_dir(self):