Skip to content

Commit

Permalink
Rollup merge of rust-lang#112146 - jyn514:locked-deps, r=clubby789
Browse files Browse the repository at this point in the history
Fix `src/etc/pre-push.sh` when `build.locked-deps` is already set

Before, cargo would error:
```
; git push
Running pre-push script /home/jyn/src/rust/x test tidy
Building bootstrap
    Finished dev [unoptimized] target(s) in 0.02s
Build stage0 tool tidy (x86_64-unknown-linux-gnu)
error: the argument '--locked' cannot be used multiple times

Usage: cargo build [OPTIONS]

For more information, try '--help'.
Build completed unsuccessfully in 0:00:00
error: failed to push some refs to 'github.com:jyn514/rust.git'
```
  • Loading branch information
matthiaskrgr committed Jun 1, 2023
2 parents d4f497e + f692cf6 commit 9c67e0c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/etc/pre-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ROOT_DIR="$(git rev-parse --show-toplevel)"
echo "Running pre-push script $ROOT_DIR/x test tidy"

cd "$ROOT_DIR"
CARGOFLAGS="--locked" ./x test tidy
./x test tidy --set build.locked-deps=true

0 comments on commit 9c67e0c

Please sign in to comment.