mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 02:18:28 -07:00
0e84962fde
Merge in DNS/adguard-home from 2276-releases to master Updates #2276. Squashed commit of the following: commit 84961947c51477aae53606ec6e2e0cce0bdfc139 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:36:13 2020 +0300 all: fix github build commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:34:02 2020 +0300 all: remove old Dockerfile, improve build scripts commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e Merge: 2292b677a5e20ac7ed
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:47:19 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:30:10 2020 +0300 all: improve docker build commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc Merge: c7d3f12efaef4659e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 17:47:45 2020 +0300 Merge branch 'master' into WIP-2276-releases commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 16:28:25 2020 +0300 all: improve build scripts commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 15:36:47 2020 +0300 all: fix Makefile commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 14:16:19 2020 +0300 scripts: fix build-release commit ecc0577e2451afa86c37da7283a63a9d26fb37ba Merge: dde64ed8e483f02c92
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 13:59:32 2020 +0300 Merge branch 'master' into WIP-2276-releases commit dde64ed8e456f73559f21c2ca549dc3b46724add Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 18:04:46 2020 +0300 all: imp docs, other improvements commit be8574408db79901bb15c1d31916db3ca352a35f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 14:48:30 2020 +0300 all: imp docker build commit fc1876f34b93d667bf166226f4bc666d394f10c7 Merge: fa5a304c8955b735c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 13:54:29 2020 +0300 Merge branch 'master' into WIP-2276-releases commit fa5a304c83d86145796a2de4141de6d18f7c56bf Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 19:10:51 2020 +0300 all: improve scripts commit 3f32e3fd5e658d058d5c5172519384efc6cfef83 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:50:01 2020 +0300 all: improve scripts commit 2d38b81421acab4b90a7a19da7598c75063e8e93 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:25:21 2020 +0300 all: fix shell for windows, improve go-lint.sh commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049 Merge: 313b020e99fb6bf82c
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:14:38 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 313b020e9dfcdab736670cee72b2171eac8c32b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:13:31 2020 +0300 Makefile: use npm ci again commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:57:54 2020 +0300 all: try fixing windows build commit c63a2a54641ac8cd032a3306bb35e49b9ae74728 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:39:30 2020 +0300 all: imp scripts, try another goproxy and direct commit 423229e8b63ee73caeee8e84c23f67d145aff9df Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:25:29 2020 +0300 all: imp HACKING.md, try a new proxy ... and 1 more commit
127 lines
2.5 KiB
Bash
127 lines
2.5 KiB
Bash
#!/bin/sh
|
|
|
|
verbose="${VERBOSE:-0}"
|
|
|
|
# Verbosity levels:
|
|
# 0 = Don't print anything except for errors.
|
|
# 1 = Print commands, but not nested commands.
|
|
# 2 = Print everything.
|
|
if [ "$verbose" -gt '0' ]
|
|
then
|
|
set -x
|
|
fi
|
|
|
|
# Set $EXIT_ON_ERROR to zero to see all errors.
|
|
if [ "${EXIT_ON_ERROR:-1}" = '0' ]
|
|
then
|
|
set +e
|
|
else
|
|
set -e
|
|
fi
|
|
|
|
# We don't need glob expansions and we want to see errors about unset
|
|
# variables.
|
|
set -f -u
|
|
|
|
not_found_msg='
|
|
looks like a binary not found error.
|
|
make sure you have installed the linter binaries using:
|
|
|
|
$ make go-tools
|
|
'
|
|
|
|
not_found() {
|
|
if [ "$?" = '127' ]
|
|
then
|
|
# Code 127 is the exit status a shell uses when
|
|
# a command or a file is not found, according to the
|
|
# Bash Hackers wiki.
|
|
#
|
|
# See https://wiki.bash-hackers.org/dict/terms/exit_status.
|
|
echo "$not_found_msg" 1>&2
|
|
fi
|
|
}
|
|
trap not_found EXIT
|
|
|
|
# blocklist_imports is a simple check against unwanted packages.
|
|
# Currently it only looks for package log which is replaced by our own
|
|
# package github.com/AdguardTeam/golibs/log.
|
|
blocklist_imports() {
|
|
git grep -F -e '"log"' -- '*.go' || exit 0;
|
|
}
|
|
|
|
# underscores is a simple check against Go filenames with underscores.
|
|
underscores() {
|
|
git ls-files '*_*.go' | { grep -F -e '_darwin.go' \
|
|
-e '_freebsd.go' -e '_linux.go' -e '_others.go' \
|
|
-e '_test.go' -e '_unix.go' -e '_windows.go' \
|
|
-v || exit 0; }
|
|
}
|
|
|
|
# exit_on_output exits with a nonzero exit code if there is anything in
|
|
# the command's combined output.
|
|
exit_on_output() {
|
|
test "$VERBOSE" -lt '2' && set +x
|
|
|
|
cmd="$1"
|
|
shift
|
|
|
|
exitcode='0'
|
|
output="$("$cmd" "$@" 2>&1)"
|
|
if [ "$output" != '' ]
|
|
then
|
|
if [ "$*" != '' ]
|
|
then
|
|
echo "combined output of '$cmd $@':"
|
|
else
|
|
echo "combined output of '$cmd':"
|
|
fi
|
|
|
|
echo "$output"
|
|
|
|
exitcode='1'
|
|
fi
|
|
|
|
test "$VERBOSE" -gt '0' && set -x
|
|
|
|
return "$exitcode"
|
|
}
|
|
|
|
exit_on_output blocklist_imports
|
|
|
|
exit_on_output underscores
|
|
|
|
exit_on_output gofumpt --extra -l -s .
|
|
|
|
golint --set_exit_status ./...
|
|
|
|
"$GO" vet ./...
|
|
|
|
gocyclo --over 20 .
|
|
|
|
gosec --quiet .
|
|
|
|
ineffassign .
|
|
|
|
unparam ./...
|
|
|
|
git ls-files -- '*.go' '*.md' '*.yaml' '*.yml' 'Makefile'\
|
|
| xargs misspell --error
|
|
|
|
looppointer ./...
|
|
|
|
nilness ./...
|
|
|
|
# TODO(a.garipov): Enable shadow after fixing all of the shadowing.
|
|
# shadow --strict ./...
|
|
|
|
# TODO(a.garipov): Enable errcheck fully after handling all errors,
|
|
# including the deferred ones, properly. Also, perhaps, enable --blank.
|
|
# errcheck ./...
|
|
exit_on_output sh -c '
|
|
errcheck --asserts ./... |\
|
|
{ grep -e "defer" -e "_test\.go:" -v || exit 0; }
|
|
'
|
|
|
|
staticcheck ./...
|