about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-01-29 20:03:38 +0100
committerGitHub <noreply@github.com>2023-01-29 20:03:38 +0100
commit6ce862cf8a36307630b93f67ec54d240c3aadd9b (patch)
tree34c50cf3aa51dfdf577f159ceb1dfabbf746d0c4
parent77e78e28870a3241deadc28e14ba82e9f8548802 (diff)
parent78db9ee21a558d43948cde67c22487993c1b23ac (diff)
downloadrust-6ce862cf8a36307630b93f67ec54d240c3aadd9b.tar.gz
rust-6ce862cf8a36307630b93f67ec54d240c3aadd9b.zip
Rollup merge of #107169 - albertlarsan68:lock-in-pre-push, r=Mark-Simulacrum
Pass `--locked` to the x test tidy call

This allows to fail the push when the `Cargo.lock` file needs to be updated.
-rwxr-xr-xsrc/etc/pre-push.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh
index 7a846d44ad6..ff17931115c 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"
-./x test tidy
+CARGOFLAGS="--locked" ./x test tidy