Skip to content

Commit

Permalink
Bug 1620779 - Use built-in cargo vendor to vendor wrench / wgpu.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
emilio committed Mar 7, 2020
1 parent 7ea3961 commit ed7d25f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions taskcluster/scripts/misc/wgpu-deps-vendoring.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ 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
Expand Down
3 changes: 1 addition & 2 deletions taskcluster/scripts/misc/wrench-deps-vendoring.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ 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
Expand Down

0 comments on commit ed7d25f

Please sign in to comment.