Bug 1525402 - Bump cargo-vendor to 0.1.23. r=kats
authorAlexis Beingessner <a.beingessner@gmail.com>
Tue, 07 May 2019 01:40:17 +0000
changeset 472818 0c2296965b7b07a50a8b8a643de442f03f196b27
parent 472817 ddce4ed9bb05e90f16187c66c798737110ca4be9
child 472819 8c7d885ae03623bf540a6d31372b5585e2aabcab
push id35978
push usershindli@mozilla.com
push dateTue, 07 May 2019 09:44:39 +0000
treeherdermozilla-central@7aee5a30dd15 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1525402
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1525402 - Bump cargo-vendor to 0.1.23. r=kats 0.1.21 mishandles cargo package renames, which are a required feature for Rust 2018 support. The latest version fixes this. Differential Revision: https://phabricator.services.mozilla.com/D29946
python/mozbuild/mozbuild/vendor_rust.py
taskcluster/scripts/misc/wrench-deps-vendoring.sh
--- a/python/mozbuild/mozbuild/vendor_rust.py
+++ b/python/mozbuild/mozbuild/vendor_rust.py
@@ -47,17 +47,17 @@ class VendorRust(MozbuildObject):
         for l in subprocess.check_output([cargo, 'install', '--list']).splitlines():
             # The line looks like one of the following:
             #  cargo-vendor v0.1.12:
             #  cargo-vendor v0.1.12 (file:///path/to/local/build/cargo-vendor):
             # and we want to extract the version part of it
             m = re.match('cargo-vendor v((\d+\.)*\d+)', l)
             if m:
                 version = m.group(1)
-                return LooseVersion(version) >= b'0.1.21'
+                return LooseVersion(version) >= b'0.1.23'
         return False
 
     def check_modified_files(self):
         '''
         Ensure that there aren't any uncommitted changes to files
         in the working copy, since we're going to change some state
         on the user. Allow changes to Cargo.{toml,lock} since that's
         likely to be a common use case.
@@ -114,17 +114,17 @@ Please commit or stash these changes bef
             self.log(logging.DEBUG, 'cargo_version', {}, 'cargo is new enough')
         have_vendor = any(l.strip() == 'vendor' for l in subprocess.check_output([cargo, '--list']).splitlines())
         if not have_vendor:
             self.log(logging.INFO, 'installing', {}, 'Installing cargo-vendor (this may take a few minutes)...')
             env = self.check_openssl()
             self.run_process(args=[cargo, 'install', 'cargo-vendor'],
                              append_env=env)
         elif not self.check_cargo_vendor_version(cargo):
-            self.log(logging.INFO, 'cargo_vendor', {}, 'cargo-vendor >= 0.1.21 required; force-reinstalling (this may take a few minutes)...')
+            self.log(logging.INFO, 'cargo_vendor', {}, 'cargo-vendor >= 0.1.23 required; force-reinstalling (this may take a few minutes)...')
             env = self.check_openssl()
             self.run_process(args=[cargo, 'install', '--force', 'cargo-vendor'],
                              append_env=env)
         else:
             self.log(logging.DEBUG, 'cargo_vendor', {}, 'sufficiently new cargo-vendor is already installed')
 
         return cargo
 
--- a/taskcluster/scripts/misc/wrench-deps-vendoring.sh
+++ b/taskcluster/scripts/misc/wrench-deps-vendoring.sh
@@ -8,17 +8,17 @@ set -x -e -v
 
 WORKSPACE=$HOME/workspace
 SRCDIR=$WORKSPACE/build/src
 UPLOAD_DIR=$HOME/artifacts
 
 cd $WORKSPACE
 . $SRCDIR/taskcluster/scripts/misc/tooltool-download.sh
 export PATH=$PATH:$SRCDIR/rustc/bin
-cargo install --version 0.1.21 cargo-vendor
+cargo install --version 0.1.23 cargo-vendor
 cd $SRCDIR/gfx/wr/
 mkdir .cargo
 cargo vendor --relative-path --sync ./Cargo.lock > .cargo/config
 mkdir wrench-deps
 mv vendor .cargo wrench-deps/
 mkdir wrench-deps/cargo-apk
 # Until there's a version of cargo-apk published on crates.io that has
 # https://github.com/tomaka/android-rs-glue/pull/205 and