Pull request 2319: websvc-patch

Merge in DNS/adguard-home from websvc-patch to master

Squashed commit of the following:

commit b2a10faf12b16f13f617b3ed3ef3e81cb0479ff8
Merge: 38f749106 8f53f6505
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 11 17:33:15 2024 +0300

    Merge branch 'master' into websvc-patch

commit 38f7491069d90d4080e7ad98b09bf9ce19138195
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 10 19:57:54 2024 +0300

    next: add json merge patch utils
This commit is contained in:
Ainar Garipov
2024-12-11 17:41:00 +03:00
parent 8f53f6505b
commit d3cc2dc930
7 changed files with 121 additions and 46 deletions

View File

@@ -133,7 +133,14 @@ if [ "$verbose" -gt '0' ]; then
"$go" env
fi
if [ "${COVER:-0}" -eq '1' ]; then
cover_flags='--cover=1'
else
cover_flags='--cover=0'
fi
"$go" build \
"$cover_flags" \
--ldflags="$ldflags" \
"$race_flags" \
"$tags_flags" \