Skip to content

Commit

Permalink
Rollup merge of #105853 - jyn514:prepush-windows, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Make the pre-push script work on directories with spaces

As a secondary benefit, it's also a lot simpler.

cc `@caass` - would love to have a review if you have time :)
  • Loading branch information
Noratrieb authored Dec 23, 2022
2 parents fd5af8c + c754d05 commit 85d39ba
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions src/etc/pre-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,8 @@ set -Eeuo pipefail
# https://github.com/rust-lang/rust/issues/77620#issuecomment-705144570
unset GIT_DIR
ROOT_DIR="$(git rev-parse --show-toplevel)"
COMMAND="$ROOT_DIR/x.py test tidy"

if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then
COMMAND="python $COMMAND"
elif ! command -v python &> /dev/null; then
COMMAND="python3 $COMMAND"
fi

echo "Running pre-push script '$COMMAND'"
echo "Running pre-push script $ROOT_DIR/x test tidy"

cd "$ROOT_DIR"

$COMMAND
./x test tidy

0 comments on commit 85d39ba

Please sign in to comment.