mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-16 20:24:15 +03:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
100 lines
2.6 KiB
Bash
100 lines
2.6 KiB
Bash
#!/bin/sh
|
|
|
|
# AdGuard Home Build Script
|
|
#
|
|
# The commentary in this file is written with the assumption that the
|
|
# reader only has superficial knowledge of the POSIX shell language and
|
|
# alike. Experienced readers may find it overly verbose.
|
|
|
|
# The default verbosity level is 0. Show every command that is run and
|
|
# every package that is processed if the caller requested verbosity
|
|
# level greater than 0. Also show subcommands if the requested
|
|
# verbosity level is greater than 1. Otherwise, do nothing.
|
|
verbose="${VERBOSE:-0}"
|
|
if [ "$verbose" -gt '1' ]
|
|
then
|
|
env
|
|
set -x
|
|
readonly v_flags='-v'
|
|
readonly x_flags='-x'
|
|
elif [ "$verbose" -gt '0' ]
|
|
then
|
|
set -x
|
|
readonly v_flags='-v'
|
|
readonly x_flags=''
|
|
else
|
|
set +x
|
|
readonly v_flags=''
|
|
readonly x_flags=''
|
|
fi
|
|
|
|
# Exit the script if a pipeline fails (-e), prevent accidental filename
|
|
# expansion (-f), and consider undefined variables as errors (-u).
|
|
set -e -f -u
|
|
|
|
# Allow users to set the Go version.
|
|
go="${GO:-go}"
|
|
|
|
# Require the channel to be set and validate the value.
|
|
channel="$CHANNEL"
|
|
case "$channel"
|
|
in
|
|
('development'|'edge'|'beta'|'release')
|
|
# All is well, go on.
|
|
;;
|
|
(*)
|
|
echo "invalid channel '$channel', supported values are\
|
|
'development', 'edge', 'beta', and 'release'" 1>&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
# Require the version to be set.
|
|
#
|
|
# TODO(a.garipov): Additional validation?
|
|
version="$VERSION"
|
|
|
|
# Set the linker flags accordingly: set the release channel and the
|
|
# current version as well as goarm and gomips variable values, if the
|
|
# variables are set and are not empty.
|
|
readonly version_pkg='github.com/AdguardTeam/AdGuardHome/internal/version'
|
|
ldflags="-s -w -X ${version_pkg}.version=${version}"
|
|
ldflags="${ldflags} -X ${version_pkg}.channel=${channel}"
|
|
if [ "${GOARM:-}" != '' ]
|
|
then
|
|
ldflags="${ldflags} -X ${version_pkg}.goarm=${GOARM}"
|
|
elif [ "${GOMIPS:-}" != '' ]
|
|
then
|
|
ldflags="${ldflags} -X ${version_pkg}.gomips=${GOMIPS}"
|
|
fi
|
|
|
|
# Allow users to limit the build's parallelism.
|
|
readonly parallelism="${PARALLELISM:-}"
|
|
if [ "$parallelism" != '' ]
|
|
then
|
|
readonly par_flags="-p ${parallelism}"
|
|
else
|
|
readonly par_flags=''
|
|
fi
|
|
|
|
# Allow users to specify a different output name.
|
|
readonly out="${OUT:-}"
|
|
if [ "$out" != '' ]
|
|
then
|
|
readonly out_flags="-o ${out}"
|
|
else
|
|
readonly out_flags=''
|
|
fi
|
|
|
|
# Don't use cgo. Use modules.
|
|
export CGO_ENABLED='0' GO111MODULE='on'
|
|
|
|
readonly build_flags="${BUILD_FLAGS:-$out_flags $par_flags\
|
|
$v_flags $x_flags}"
|
|
|
|
# Don't use quotes with flag variables to get word splitting.
|
|
"$go" generate $v_flags $x_flags ./...
|
|
|
|
# Don't use quotes with flag variables to get word splitting.
|
|
"$go" build --ldflags "$ldflags" $build_flags
|