mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 21:37:58 +03:00
Meta: Update lint-{clang-format,shell-scripts}.sh to take a list of files
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:
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
@ -5,4 +5,3 @@ repos:
|
|||||||
name: Running Meta/lint-ci.sh to ensure changes will pass linting on CI
|
name: Running Meta/lint-ci.sh to ensure changes will pass linting on CI
|
||||||
entry: bash Meta/lint-ci.sh
|
entry: bash Meta/lint-ci.sh
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
|
||||||
|
@ -20,8 +20,8 @@ for cmd in \
|
|||||||
Meta/lint-executable-resources.sh \
|
Meta/lint-executable-resources.sh \
|
||||||
Meta/lint-ipc-ids.sh \
|
Meta/lint-ipc-ids.sh \
|
||||||
Meta/lint-shell-scripts.sh; do
|
Meta/lint-shell-scripts.sh; do
|
||||||
echo "Running $cmd... "
|
echo "Running ${cmd}... "
|
||||||
if $cmd; then
|
if "${cmd}" "$@"; then
|
||||||
echo -e "[${GREEN}OK${NC}]: ${cmd}"
|
echo -e "[${GREEN}OK${NC}]: ${cmd}"
|
||||||
else
|
else
|
||||||
echo -e "[${RED}FAIL${NC}]: ${cmd}"
|
echo -e "[${RED}FAIL${NC}]: ${cmd}"
|
||||||
@ -30,7 +30,7 @@ for cmd in \
|
|||||||
done
|
done
|
||||||
|
|
||||||
echo "Running Meta/lint-clang-format.sh"
|
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"
|
echo -e "[${GREEN}OK${NC}]: Meta/lint-clang-format.sh"
|
||||||
else
|
else
|
||||||
echo -e "[${RED}FAIL${NC}]: Meta/lint-clang-format.sh"
|
echo -e "[${RED}FAIL${NC}]: Meta/lint-clang-format.sh"
|
||||||
|
@ -20,7 +20,7 @@ else
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
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.
|
true # The only way to run this script.
|
||||||
else
|
else
|
||||||
# Note that this branch also covers --help, -h, -help, -?, etc.
|
# Note that this branch also covers --help, -h, -help, -?, etc.
|
||||||
@ -31,7 +31,8 @@ fi
|
|||||||
|
|
||||||
echo "Using ${CLANG_FORMAT}"
|
echo "Using ${CLANG_FORMAT}"
|
||||||
|
|
||||||
{
|
if [ "$#" -eq "1" ]; then
|
||||||
|
mapfile -t files < <(
|
||||||
git ls-files -- \
|
git ls-files -- \
|
||||||
'*.cpp' \
|
'*.cpp' \
|
||||||
'*.h' \
|
'*.h' \
|
||||||
@ -42,8 +43,20 @@ echo "Using ${CLANG_FORMAT}"
|
|||||||
':!:Libraries/LibC/syslog.h' \
|
':!:Libraries/LibC/syslog.h' \
|
||||||
':!:Libraries/LibCore/puff.h' \
|
':!:Libraries/LibCore/puff.h' \
|
||||||
':!:Libraries/LibCore/puff.cpp' \
|
':!:Libraries/LibCore/puff.cpp' \
|
||||||
':!:Libraries/LibELF/exec_elf.h' \
|
':!:Libraries/LibELF/exec_elf.h'
|
||||||
|| echo "'git ls-files failed!'"
|
)
|
||||||
} | xargs -d'\n' "${CLANG_FORMAT}" -style=file -i
|
else
|
||||||
|
files=()
|
||||||
|
for file in "${@:2}"; do
|
||||||
|
if [[ "${file}" == *".cpp" || "${file}" == *".h" ]]; then
|
||||||
|
files+=("${file}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if (( ${#files[@]} )); then
|
||||||
|
"${CLANG_FORMAT}" -style=file -i "${files[@]}"
|
||||||
echo "Maybe some files have changed. Sorry, but clang-format doesn't indicate what happened."
|
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
|
||||||
|
@ -10,24 +10,25 @@ if ! command -v shellcheck &>/dev/null ; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ERRORS=()
|
if [ "$#" -eq "0" ]; then
|
||||||
|
mapfile -t files < <(
|
||||||
while IFS= read -r f; do
|
git ls-files -- \
|
||||||
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 -- \
|
|
||||||
'*.sh' \
|
'*.sh' \
|
||||||
':!:Toolchain' \
|
':!:Toolchain' \
|
||||||
':!:Ports' \
|
':!:Ports' \
|
||||||
':!:Shell/Tests' \
|
':!:Shell/Tests'
|
||||||
)
|
)
|
||||||
|
else
|
||||||
if (( ${#ERRORS[@]} )); then
|
files=()
|
||||||
echo "Files failing shellcheck: ${ERRORS[*]}"
|
for file in "$@"; do
|
||||||
exit 1
|
if [[ "${file}" == *".sh" ]]; then
|
||||||
|
files+=("${file}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if (( ${#files[@]} )); then
|
||||||
|
shellcheck "${files[@]}"
|
||||||
|
else
|
||||||
|
echo "No .sh files to check."
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user