зеркало из https://github.com/mozilla/gecko-dev.git
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 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
1017bd764c
Коммит
52bd6c3025
|
@ -52,7 +52,7 @@ class VendorRust(MozbuildObject):
|
|||
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):
|
||||
|
@ -119,7 +119,7 @@ Please commit or stash these changes before vendoring, or re-run with `--ignore-
|
|||
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)
|
||||
|
|
|
@ -13,7 +13,7 @@ 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
|
||||
|
|
Загрузка…
Ссылка в новой задаче