CI: Visibly print trailing whitespace when static checks fail
GitHub Actions seems to be hiding colored whitespace, and after lots of attempts I couldn't find a way to work it around. So instead I'm using a perl expression to replace trailing spaces with `·` and tabs with `<TAB>` in the ANSI colored diff output. This ensure that they're visible, and they are properly colored as expected too.
This commit is contained in:
parent
44d539465a
commit
266280ffca
|
@ -22,7 +22,8 @@ jobs:
|
||||||
sudo apt-get install -qq dos2unix clang-format-15 libxml2-utils python3-pip moreutils
|
sudo apt-get install -qq dos2unix clang-format-15 libxml2-utils python3-pip moreutils
|
||||||
sudo update-alternatives --remove-all clang-format || true
|
sudo update-alternatives --remove-all clang-format || true
|
||||||
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 100
|
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 100
|
||||||
sudo pip3 install black==22.3.0 pygments pytest==7.1.2 mypy==0.971
|
sudo pip3 install black==22.3.0 pytest==7.1.2 mypy==0.971
|
||||||
|
git config diff.wsErrorHighlight all
|
||||||
|
|
||||||
- name: File formatting checks (file_format.sh)
|
- name: File formatting checks (file_format.sh)
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -13,13 +13,14 @@ diff=$(git diff --color)
|
||||||
|
|
||||||
# If no diff has been generated all is OK, clean up, and exit.
|
# If no diff has been generated all is OK, clean up, and exit.
|
||||||
if [ -z "$diff" ] ; then
|
if [ -z "$diff" ] ; then
|
||||||
printf "Files in this commit comply with the black style rules.\n"
|
printf "\e[1;32m*** Files in this commit comply with the black style rules.\e[0m\n"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# A diff has been created, notify the user, clean up, and exit.
|
# A diff has been created, notify the user, clean up, and exit.
|
||||||
printf "\n*** The following differences were found between the code "
|
printf "\n\e[1;33m*** The following changes must be made to comply with the formatting rules:\e[0m\n\n"
|
||||||
printf "and the formatting rules:\n\n"
|
# Perl commands replace trailing spaces with `·` and tabs with `<TAB>`.
|
||||||
echo "$diff"
|
printf "$diff\n" | perl -pe 's/(.*[^ ])( +)(\e\[m)$/my $spaces="·" x length($2); sprintf("$1$spaces$3")/ge' | perl -pe 's/(.*[^\t])(\t+)(\e\[m)$/my $tabs="<TAB>" x length($2); sprintf("$1$tabs$3")/ge'
|
||||||
printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
|
||||||
|
printf "\n\e[1;91m*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\e[0m\n"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -33,12 +33,14 @@ diff=$(git diff --color)
|
||||||
|
|
||||||
# If no diff has been generated all is OK, clean up, and exit.
|
# If no diff has been generated all is OK, clean up, and exit.
|
||||||
if [ -z "$diff" ] ; then
|
if [ -z "$diff" ] ; then
|
||||||
printf "Files in this commit comply with the clang-format style rules.\n"
|
printf "\e[1;32m*** Files in this commit comply with the clang-format style rules.\e[0m\n"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# A diff has been created, notify the user, clean up, and exit.
|
# A diff has been created, notify the user, clean up, and exit.
|
||||||
printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
|
printf "\n\e[1;33m*** The following changes must be made to comply with the formatting rules:\e[0m\n\n"
|
||||||
echo "$diff"
|
# Perl commands replace trailing spaces with `·` and tabs with `<TAB>`.
|
||||||
printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
printf "$diff\n" | perl -pe 's/(.*[^ ])( +)(\e\[m)$/my $spaces="·" x length($2); sprintf("$1$spaces$3")/ge' | perl -pe 's/(.*[^\t])(\t+)(\e\[m)$/my $tabs="<TAB>" x length($2); sprintf("$1$tabs$3")/ge'
|
||||||
|
|
||||||
|
printf "\n\e[1;91m*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\e[0m\n"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -20,12 +20,14 @@ diff=$(git diff --color)
|
||||||
|
|
||||||
# If no diff has been generated all is OK, clean up, and exit.
|
# If no diff has been generated all is OK, clean up, and exit.
|
||||||
if [ -z "$diff" ] ; then
|
if [ -z "$diff" ] ; then
|
||||||
printf "Files in this commit comply with the clang-tidy style rules.\n"
|
printf "\e[1;32m*** Files in this commit comply with the clang-tidy style rules.\e[0m\n"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# A diff has been created, notify the user, clean up, and exit.
|
# A diff has been created, notify the user, clean up, and exit.
|
||||||
printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
|
printf "\n\e[1;33m*** The following changes must be made to comply with the formatting rules:\e[0m\n\n"
|
||||||
echo "$diff"
|
# Perl commands replace trailing spaces with `·` and tabs with `<TAB>`.
|
||||||
printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
printf "$diff\n" | perl -pe 's/(.*[^ ])( +)(\e\[m)$/my $spaces="·" x length($2); sprintf("$1$spaces$3")/ge' | perl -pe 's/(.*[^\t])(\t+)(\e\[m)$/my $tabs="<TAB>" x length($2); sprintf("$1$tabs$3")/ge'
|
||||||
|
|
||||||
|
printf "\n\e[1;91m*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\e[0m\n"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -24,12 +24,14 @@ diff=$(git diff --color)
|
||||||
|
|
||||||
# If no diff has been generated all is OK, clean up, and exit.
|
# If no diff has been generated all is OK, clean up, and exit.
|
||||||
if [ -z "$diff" ] ; then
|
if [ -z "$diff" ] ; then
|
||||||
printf "Files in this commit comply with the dotnet format style rules.\n"
|
printf "\e[1;32m*** Files in this commit comply with the dotnet format style rules.\e[0m\n"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# A diff has been created, notify the user, clean up, and exit.
|
# A diff has been created, notify the user, clean up, and exit.
|
||||||
printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
|
printf "\n\e[1;33m*** The following changes must be made to comply with the formatting rules:\e[0m\n\n"
|
||||||
echo "$diff"
|
# Perl commands replace trailing spaces with `·` and tabs with `<TAB>`.
|
||||||
printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
printf "$diff\n" | perl -pe 's/(.*[^ ])( +)(\e\[m)$/my $spaces="·" x length($2); sprintf("$1$spaces$3")/ge' | perl -pe 's/(.*[^\t])(\t+)(\e\[m)$/my $tabs="<TAB>" x length($2); sprintf("$1$tabs$3")/ge'
|
||||||
|
|
||||||
|
printf "\n\e[1;91m*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\e[0m\n"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -56,7 +56,7 @@ diff=$(git diff --color)
|
||||||
if [ ! -s utf8-validation.txt ] && [ -z "$diff" ] ; then
|
if [ ! -s utf8-validation.txt ] && [ -z "$diff" ] ; then
|
||||||
# If no UTF-8 violations were collected (the file is empty) and
|
# If no UTF-8 violations were collected (the file is empty) and
|
||||||
# no diff has been generated all is OK, clean up, and exit.
|
# no diff has been generated all is OK, clean up, and exit.
|
||||||
printf "Files in this commit comply with the formatting rules.\n"
|
printf "\e[1;32m*** Files in this commit comply with the file formatting rules.\e[0m\n"
|
||||||
rm -f utf8-validation.txt
|
rm -f utf8-validation.txt
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
@ -65,7 +65,7 @@ if [ -s utf8-validation.txt ]
|
||||||
then
|
then
|
||||||
# If the file has content and is not empty, violations
|
# If the file has content and is not empty, violations
|
||||||
# detected, notify the user, clean up, and exit.
|
# detected, notify the user, clean up, and exit.
|
||||||
printf "\n*** The following files contain invalid UTF-8 character sequences:\n\n"
|
printf "\n\e[1;33m*** The following files contain invalid UTF-8 character sequences:\e[0m\n\n"
|
||||||
cat utf8-validation.txt
|
cat utf8-validation.txt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -73,10 +73,11 @@ rm -f utf8-validation.txt
|
||||||
|
|
||||||
if [ ! -z "$diff" ]
|
if [ ! -z "$diff" ]
|
||||||
then
|
then
|
||||||
printf "\n*** The following differences were found between the code "
|
# A diff has been created, notify the user, clean up, and exit.
|
||||||
printf "and the formatting rules:\n\n"
|
printf "\n\e[1;33m*** The following changes must be made to comply with the formatting rules:\e[0m\n\n"
|
||||||
echo "$diff"
|
# Perl commands replace trailing spaces with `·` and tabs with `<TAB>`.
|
||||||
|
printf "$diff\n" | perl -pe 's/(.*[^ ])( +)(\e\[m)$/my $spaces="·" x length($2); sprintf("$1$spaces$3")/ge' | perl -pe 's/(.*[^\t])(\t+)(\e\[m)$/my $tabs="<TAB>" x length($2); sprintf("$1$tabs$3")/ge'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
printf "\n\e[1;91m*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\e[0m\n"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -66,13 +66,14 @@ diff=$(git diff --color)
|
||||||
|
|
||||||
# If no diff has been generated all is OK, clean up, and exit.
|
# If no diff has been generated all is OK, clean up, and exit.
|
||||||
if [ -z "$diff" ] ; then
|
if [ -z "$diff" ] ; then
|
||||||
printf "Files in this commit comply with the header guards formatting rules.\n"
|
printf "\e[1;32m*** Files in this commit comply with the header guards formatting rules.\e[0m\n"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# A diff has been created, notify the user, clean up, and exit.
|
# A diff has been created, notify the user, clean up, and exit.
|
||||||
printf "\n*** The following differences were found between the code "
|
printf "\n\e[1;33m*** The following changes must be made to comply with the formatting rules:\e[0m\n\n"
|
||||||
printf "and the header guards formatting rules:\n\n"
|
# Perl commands replace trailing spaces with `·` and tabs with `<TAB>`.
|
||||||
echo "$diff"
|
printf "$diff\n" | perl -pe 's/(.*[^ ])( +)(\e\[m)$/my $spaces="·" x length($2); sprintf("$1$spaces$3")/ge' | perl -pe 's/(.*[^\t])(\t+)(\e\[m)$/my $tabs="<TAB>" x length($2); sprintf("$1$tabs$3")/ge'
|
||||||
printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
|
||||||
|
printf "\n\e[1;91m*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\e[0m\n"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue