Pull request 2269: ADG-8932 Upd all
Squashed commit of the following: commit 00fc45877776ed7d1c59be26330f6f16d784ead2 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 20 16:21:25 2024 +0300 all: imp lint commit b04d9cd334a92faf21787e7e1ebf20d5e5fd0bee Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 20 14:40:18 2024 +0300 all: upd all commit f151f8c3139a0d8ac8cc5cf4926710b8d3f98846 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 16 13:12:36 2024 +0300 all: upd proxy
This commit is contained in:
@@ -6,7 +6,7 @@ set -e -f -u
|
||||
# Bump this number every time a significant change is made to this
|
||||
# script.
|
||||
#
|
||||
# AdGuard-Project-Version: 2
|
||||
# AdGuard-Project-Version: 3
|
||||
|
||||
# TODO(a.garipov): Add pre-merge-commit.
|
||||
|
||||
@@ -56,13 +56,15 @@ prompt() {
|
||||
# Warn the programmer about unstaged changes and untracked files, but do
|
||||
# not fail the commit, because those changes might be temporary or for
|
||||
# a different branch.
|
||||
#
|
||||
# shellcheck disable=SC2016
|
||||
awk_prog='substr($2, 2, 1) != "." { print $9; } $1 == "?" { print $2; }'
|
||||
readonly awk_prog
|
||||
|
||||
unstaged="$( git status --porcelain=2 | awk "$awk_prog" )"
|
||||
readonly unstaged
|
||||
|
||||
if [ "$unstaged" != "" ]
|
||||
if [ "$unstaged" != '' ]
|
||||
then
|
||||
printf 'WARNING: you have unstaged changes:\n\n%s\n\n' "$unstaged"
|
||||
prompt
|
||||
@@ -73,7 +75,7 @@ fi
|
||||
temp_todos="$( git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' || : )"
|
||||
readonly temp_todos
|
||||
|
||||
if [ "$temp_todos" != "" ]
|
||||
if [ "$temp_todos" != '' ]
|
||||
then
|
||||
printf 'WARNING: you have temporary todos:\n\n%s\n\n' "$temp_todos"
|
||||
prompt
|
||||
@@ -82,22 +84,32 @@ fi
|
||||
verbose="${VERBOSE:-0}"
|
||||
readonly verbose
|
||||
|
||||
if [ "$( git diff --cached --name-only -- 'client/*.js' )" ]
|
||||
if [ "$( git diff --cached --name-only -- 'client/*.js' || true )" != '' ]
|
||||
then
|
||||
make VERBOSE="$verbose" js-lint js-test
|
||||
fi
|
||||
|
||||
if [ "$( git diff --cached --name-only -- '*.go' '*.mod' '*.sh' 'Makefile' )" ]
|
||||
if [ "$( git diff --cached --name-only -- '*.go' '*.mod' 'Makefile' || true )" != '' ]
|
||||
then
|
||||
make VERBOSE="$verbose" go-os-check go-lint go-test
|
||||
fi
|
||||
|
||||
if [ "$( git diff --cached --name-only -- '*.md' '*.txt' '*.yaml' '*.yml' )" ]
|
||||
if [ "$( git diff --cached --name-only -- '*.md' || true )" != '' ]
|
||||
then
|
||||
make VERBOSE="$verbose" md-lint
|
||||
fi
|
||||
|
||||
if [ "$( git diff --cached --name-only -- '*.sh' || true )" != '' ]
|
||||
then
|
||||
make VERBOSE="$verbose" sh-lint
|
||||
fi
|
||||
|
||||
if [ "$( git diff --cached --name-only -- '*.md' '*.txt' '*.yaml' '*.yml' || true )" != '' ]
|
||||
then
|
||||
make VERBOSE="$verbose" txt-lint
|
||||
fi
|
||||
|
||||
if [ "$( git diff --cached --name-only -- './openapi/openapi.yaml' )" ]
|
||||
if [ "$( git diff --cached --name-only -- './openapi/openapi.yaml' || true )" != '' ]
|
||||
then
|
||||
make VERBOSE="$verbose" openapi-lint
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user