hooks/pre-commit: run yamllint on more YAML files

I keep messing up YAML syntax with values that have : in them...

This doesn't work for all YAML files:
* tests/metadata/dump/*.yaml have bad indenting
* tests/metadata/*.yml have bad indenting, which is useful for tests
This commit is contained in:
Hans-Christoph Steiner 2023-04-21 09:10:04 +02:00
parent 1bcd9a8489
commit d7214a7f1c
3 changed files with 6 additions and 3 deletions

View File

@ -2,4 +2,6 @@
extends: default extends: default
rules: rules:
document-start: disable
line-length: disable line-length: disable
truthy: disable

View File

@ -1,3 +1,4 @@
---
# You may want to alter these before running ./makebuildserver # You may want to alter these before running ./makebuildserver

View File

@ -13,7 +13,7 @@ if [ -z "$files" ]; then
SH_FILES="hooks/pre-commit" SH_FILES="hooks/pre-commit"
BASH_FILES="gradlew-fdroid jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*" BASH_FILES="gradlew-fdroid jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*"
RB_FILES="buildserver/Vagrantfile" RB_FILES="buildserver/Vagrantfile"
YML_FILES="buildserver/*.yml examples/*.yml" YML_FILES=".*.yml .yamllint */*.yml */*.yaml"
else else
# if actually committing right now, then only run on the files # if actually committing right now, then only run on the files
# that are going to be committed at this moment # that are going to be committed at this moment
@ -36,7 +36,7 @@ else
*.rb) *.rb)
RB_FILES+=" $f" RB_FILES+=" $f"
;; ;;
*.yml) *.yml|.*.yml|.yamllint)
YML_FILES+=" $f" YML_FILES+=" $f"
;; ;;
*) *)
@ -139,7 +139,7 @@ for f in $RB_FILES; do
done done
for f in $YML_FILES; do for f in $YML_FILES; do
if ! $YAMLLINT $f 1>/dev/null; then if ! $YAMLLINT $f; then
err ".yml tests failed on $f!" err ".yml tests failed on $f!"
fi fi
done done