diff options
-rwxr-xr-x | lint/docker_run_rm.sh | 17 | ||||
-rwxr-xr-x | lint/lint_diff.sh | 25 |
2 files changed, 35 insertions, 7 deletions
diff --git a/lint/docker_run_rm.sh b/lint/docker_run_rm.sh new file mode 100755 index 0000000..3d6648e --- /dev/null +++ b/lint/docker_run_rm.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Verify that "docker run" has a "--rm" in the same line or next line, so we +# don't fill up space on jenkins nodes with never deleted containers: +# https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up + +RET=0 + +for i in $(git grep -l '^[^#]*docker run'); do + if [ -z "$(grep -A1 "docker run" "$i" | grep -- "--rm")" ]; then + echo "ERROR: missing --rm after 'docker run' (same line or next line):" + grep --color=always -H -n -A1 "docker run" "$i" + echo + RET=1 + fi +done + +exit $RET diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index f8daab7..0762f6b 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -19,20 +19,31 @@ if [ -z "$COMMIT" ]; then fi fi +ERROR=0 + +echo "Running docker_run_rm.sh on the whole tree..." +echo +if ! "$SCRIPT_DIR"/docker_run_rm.sh; then + ERROR=1 +fi + echo "Running checkpatch on 'git diff $COMMIT'..." echo -if git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" - \ +if ! git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" - \ --color=always \ --mailback \ --show-types \ --showfile \ --terse then - exit 0 + ERROR=1 fi -echo -echo "Please fix the linting errors above. More information:" -echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Linting" -echo -exit 1 + +if [ "$ERROR" = 1 ]; then + echo + echo "Please fix the linting errors above. More information:" + echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Linting" + echo + exit 1 +fi |