diff options
| author | jyn <github@jyn.dev> | 2023-05-31 11:54:27 -0500 |
|---|---|---|
| committer | jyn <github@jyn.dev> | 2023-05-31 11:54:27 -0500 |
| commit | f692cf6fd16568bf05054d5f67bd87bf075eee51 (patch) | |
| tree | 76e67272f18d4151e3de60278301912a82967139 | |
| parent | e6e4f7ed1589e03bc2f6c5931c1a72e7947e8682 (diff) | |
| download | rust-f692cf6fd16568bf05054d5f67bd87bf075eee51.tar.gz rust-f692cf6fd16568bf05054d5f67bd87bf075eee51.zip | |
Fix `src/etc/pre-push.sh` when `build.locked-deps` is already set in config.toml
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'
```
| -rwxr-xr-x | src/etc/pre-push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index ff17931115c..0807e0492c1 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -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 |