beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Meta: Update lint-{clang-format,shell-scripts}.sh to take a list of files

Browse source 
This should speed up pre-commit a bit as only files that are staged will
be processed, and clang-format and shellcheck are only invoked once, not
for every file. When no arguments are given (e.g. on CI), it still uses
'git ls-files'.
This commit is contained in:
Linus Groh 2020-12-27 15:34:06 +01:00 committed by Andreas Kling
parent a56b3cbf7c
commit 51bcfb5a44
Notes: sideshowbarker 2024-07-19 00:33:10 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/51bcfb5a44e
Pull-request: https://github.com/SerenityOS/serenity/pull/4570
4 changed files with 56 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.pre-commit-config.yaml
View file

@ -5,4 +5,3 @@ repos:
name: Running Meta/lint-ci.sh to ensure changes will pass linting on CI
entry: bash Meta/lint-ci.sh
language: system
pass_filenames: false

6
Meta/lint-ci.sh
View file

@ -20,8 +20,8 @@ for cmd in \
Meta/lint-executable-resources.sh \
Meta/lint-ipc-ids.sh \
Meta/lint-shell-scripts.sh; do
echo "Running $cmd... "
if $cmd; then
echo "Running ${cmd}... "
if "${cmd}" "$@"; then
echo -e "[${GREEN}OK${NC}]: ${cmd}"
else
echo -e "[${RED}FAIL${NC}]: ${cmd}"
@ -30,7 +30,7 @@ for cmd in \
done
echo "Running Meta/lint-clang-format.sh"
if Meta/lint-clang-format.sh --overwrite-inplace && git diff --exit-code; then
if Meta/lint-clang-format.sh --overwrite-inplace "$@" && git diff --exit-code; then
echo -e "[${GREEN}OK${NC}]: Meta/lint-clang-format.sh"
else
echo -e "[${RED}FAIL${NC}]: Meta/lint-clang-format.sh"

25
Meta/lint-clang-format.sh
View file

@ -20,7 +20,7 @@ else
exit 1
fi
if [ "$#" -eq "1" ] && [ "x--overwrite-inplace" = "x$1" ] ; then
if [ "$#" -gt "0" ] && [ "x--overwrite-inplace" = "x$1" ] ; then
true # The only way to run this script.
else
# Note that this branch also covers --help, -h, -help, -?, etc.
@ -31,7 +31,8 @@ fi
echo "Using ${CLANG_FORMAT}"
{
if [ "$#" -eq "1" ]; then
mapfile -t files < <(
git ls-files -- \
'*.cpp' \
'*.h' \
@ -42,8 +43,20 @@ echo "Using ${CLANG_FORMAT}"
':!:Libraries/LibC/syslog.h' \
':!:Libraries/LibCore/puff.h' \
':!:Libraries/LibCore/puff.cpp' \
':!:Libraries/LibELF/exec_elf.h' \
|| echo "'git ls-files failed!'"
} | xargs -d'\n' "${CLANG_FORMAT}" -style=file -i
':!:Libraries/LibELF/exec_elf.h'
)
else
files=()
for file in "${@:2}"; do
if [[ "${file}" == *".cpp" || "${file}" == *".h" ]]; then
files+=("${file}")
fi
done
fi
echo "Maybe some files have changed. Sorry, but clang-format doesn't indicate what happened."
if (( ${#files[@]} )); then
"${CLANG_FORMAT}" -style=file -i "${files[@]}"
echo "Maybe some files have changed. Sorry, but clang-format doesn't indicate what happened."
else
echo "No .cpp or .h files to check."
fi

35
Meta/lint-shell-scripts.sh
View file

@ -10,24 +10,25 @@ if ! command -v shellcheck &>/dev/null ; then
exit 1
fi
ERRORS=()
while IFS= read -r f; do
if file "$f" | grep --quiet shell; then
{
shellcheck "$f" && echo -e "[\033[0;32mOK\033[0m]: successfully linted $f"
} || {
ERRORS+=("$f")
}
fi
done < <(git ls-files -- \
if [ "$#" -eq "0" ]; then
mapfile -t files < <(
git ls-files -- \
'*.sh' \
':!:Toolchain' \
':!:Ports' \
':!:Shell/Tests' \
)
if (( ${#ERRORS[@]} )); then
echo "Files failing shellcheck: ${ERRORS[*]}"
exit 1
':!:Shell/Tests'
)
else
files=()
for file in "$@"; do
if [[ "${file}" == *".sh" ]]; then
files+=("${file}")
fi
done
fi
if (( ${#files[@]} )); then
shellcheck "${files[@]}"
else
echo "No .sh files to check."
fi