Bug 1620779 - Use built-in cargo vendor to vendor wrench / wgpu. a=NPOTB
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sat, 07 Mar 2020 21:09:06 +0100
changeset 579440 7bbb74cde1d29549bdb3a4d9e37654bcb53eb0e4
parent 579439 b5803347abb5f6920909b51dbbf18933908c22c1
child 579441 bbfdcf44cbf602a721e9532b7bfc24bdcd6ac053
push id2284
push userarchaeopteryx@coole-files.de
push dateMon, 09 Mar 2020 16:02:06 +0000
treeherdermozilla-release@bbfdcf44cbf6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNPOTB
bugs1620779
milestone74.0
Bug 1620779 - Use built-in cargo vendor to vendor wrench / wgpu. a=NPOTB We were using the old cargo-vendor, which tries to fetch dependencies in a way that crates.io dislikes, leading to spurious timeouts. Use the built-in command instead. We no longer need the --relative-path flag because the built-in one uses a relative path by default. MANUAL PUSH: Fixing tree closure, so need to push on CLOSED TREE. Differential Revision: https://phabricator.services.mozilla.com/D65882
taskcluster/scripts/misc/wgpu-deps-vendoring.sh
taskcluster/scripts/misc/wrench-deps-vendoring.sh
--- a/taskcluster/scripts/misc/wgpu-deps-vendoring.sh
+++ b/taskcluster/scripts/misc/wgpu-deps-vendoring.sh
@@ -5,20 +5,19 @@ set -x -e -v
 # to test `wgpu`, and exports those dependencies as a tarball.
 # This avoids having to download these dependencies on every test job
 # that tests `wgpu`.
 
 UPLOAD_DIR=$HOME/artifacts
 
 cd $GECKO_PATH
 export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin:$HOME/.cargo/bin
-cargo install --version 0.1.23 cargo-vendor
 cd gfx/wgpu/
 mkdir .cargo
-cargo-vendor vendor --relative-path --sync ./Cargo.toml > .cargo/config
+cargo vendor --sync ./Cargo.toml > .cargo/config
 mkdir wgpu-deps
 mv vendor .cargo wgpu-deps/
 mkdir wgpu-deps/cargo-apk
 # Until there's a version of cargo-apk published on crates.io that has
 # https://github.com/rust-windowing/android-rs-glue/pull/223, we need to use
 # an unpublished version.
 cargo install --path $MOZ_FETCHES_DIR/android-rs-glue/cargo-apk --root wgpu-deps/cargo-apk cargo-apk
 tar caf wgpu-deps.tar.bz2 wgpu-deps
--- a/taskcluster/scripts/misc/wrench-deps-vendoring.sh
+++ b/taskcluster/scripts/misc/wrench-deps-vendoring.sh
@@ -5,20 +5,19 @@ set -x -e -v
 # to build `wrench` (a tool used for standalone testing of webrender), and
 # exports those dependencies as a tarball. This avoids having to download
 # these dependencies on every test job that uses `wrench`.
 
 UPLOAD_DIR=$HOME/artifacts
 
 cd $GECKO_PATH
 export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin:$HOME/.cargo/bin
-cargo install --version 0.1.23 cargo-vendor
 cd gfx/wr/
 mkdir .cargo
-cargo-vendor vendor --relative-path --sync ./Cargo.toml > .cargo/config
+cargo vendor --sync ./Cargo.toml > .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/rust-windowing/android-rs-glue/pull/223, we need to use
 # an unpublished version.
 cargo install --path $MOZ_FETCHES_DIR/android-rs-glue/cargo-apk --root wrench-deps/cargo-apk cargo-apk
 tar caf wrench-deps.tar.bz2 wrench-deps