diff --git a/.github/shfmt.sh b/.github/shfmt.sh index 04de610..a8ee073 100644 --- a/.github/shfmt.sh +++ b/.github/shfmt.sh @@ -37,9 +37,12 @@ set -u shfmt --version -shfmt --diff --simplify --indent 2 --case-indent ./ - -find . -type f -name '*.envrc' -print0 | xargs -0 --max-procs=2 --verbose -I{} shfmt --diff --simplify --indent 2 --case-indent {} +# Diff with +# shfmt --diff --simplify --indent 2 --case-indent ./ +# find . -type f -name '*.envrc' -print0 | xargs -0 --max-procs=2 --verbose -I{} shfmt --diff --simplify --indent 2 --case-indent {} # Fix with -# shfmt --write --simplify --indent 2 --case-indent ./ +shfmt --write --simplify --indent 2 --case-indent ./ +find . -type f -name '*.envrc' -print0 | xargs -0 --max-procs=2 --verbose -I{} shfmt --write --simplify --indent 2 --case-indent {} + +bash -ex ./.github/git-has-uncommited-changes.sh diff --git a/.github/terraform-fmt.sh b/.github/terraform-fmt.sh index 8761cad..d160b99 100644 --- a/.github/terraform-fmt.sh +++ b/.github/terraform-fmt.sh @@ -31,7 +31,10 @@ export IAC_BIN=terraform $IAC_BIN version +# Diff with $IAC_BIN fmt -list=true -check -recursive ./ # Fix with -# terraform fmt -recursive ./ +$IAC_BIN fmt -recursive ./ + +bash -ex ./.github/git-has-uncommited-changes.sh