AdguardTeam/dnsproxy
1
0
Fork 0
mirror of https://github.com/AdguardTeam/dnsproxy.git synced 2026-10-12 02:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull request #432: AGDNS-4007-imp-github-actions-security

Browse Source 
Merge in GO/dnsproxy from AGDNS-4007-imp-github-actions-security to master

Squashed commit of the following:

commit 8115fb6777c915154c7deca52782ec0d94ad9827
Merge: 3cf2b41 46a7d36
Author: Maksim Kazantsev <[email protected]>
Date:   Wed May 20 19:21:36 2026 +0300

    Merge branch 'master' into AGDNS-4007-imp-github-actions-security

commit 3cf2b41611e486d86aec91fa2b7f6d01059ceab6
Author: Maksim Kazantsev <[email protected]>
Date:   Wed May 20 15:41:27 2026 +0300

    make: rm version validation from build-docker

commit c869c7c92a466e89c90acd835d6d10b167212f9d
Author: Maksim Kazantsev <[email protected]>
Date:   Wed May 20 15:24:37 2026 +0300

    make: replace echo with printf in log;

commit 7d21be53ff9614f6e7d39d422e6d46fffec453ea
Author: Maksim Kazantsev <[email protected]>
Date:   Wed May 20 15:23:09 2026 +0300

    make: replace echo with printf;

commit f70691bae25a204c28edc1fbe0b515a4a5f2d363
Author: Maksim Kazantsev <[email protected]>
Date:   Wed May 20 12:37:21 2026 +0300

    make: imp scripts;

commit b1d2612117a25708f22c9a7834787c8f71d481a7
Author: Maksim Kazantsev <[email protected]>
Date:   Tue May 19 19:50:46 2026 +0300

    make: fix invalid case;

commit a5854eb5301efa4de2aa49e831890dd6fec986f4
Author: Maksim Kazantsev <[email protected]>
Date:   Tue May 19 18:05:11 2026 +0300

    make: fix invalid logic;

commit a22cf60438add897da0786116ca3ea1957172729
Author: Maksim Kazantsev <[email protected]>
Date:   Tue May 19 17:02:50 2026 +0300

    all: imp github actions security;
This commit is contained in:
Maksim Kazantsev
2026-05-20 16:31:22 +00:00
parent 46a7d36c08
commit c28516ad50
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yaml
+1 -5
View File
@@ -67,11 +67,7 @@ jobs:
run: |-
set -e -u -x
RELEASE_VERSION="${GITHUB_REF##*/}"
if [[ "${RELEASE_VERSION}" != v* ]]; then RELEASE_VERSION='dev'; fi
echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> $GITHUB_ENV
make VERBOSE=1 VERSION="${RELEASE_VERSION}" release
make VERBOSE=1 release
ls -l build/dnsproxy-*
- name: Create release
.github/workflows/docker.yml → .github/workflows/docker.yaml
-5
View File
@@ -50,16 +50,11 @@
'run': |-
set -e -u -x
RELEASE_VERSION="${GITHUB_REF##*/}"
if [[ "${RELEASE_VERSION}" != v* ]]; then RELEASE_VERSION='dev'; fi
echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> $GITHUB_ENV
docker login \
-u="${DOCKER_USER}" \
-p="${DOCKER_PASSWORD}"
make \
VERSION="${RELEASE_VERSION}" \
DOCKER_IMAGE_NAME="adguard/dnsproxy" \
DOCKER_PUSH="1" \
VERBOSE="1" \
scripts/make/build-release.sh
+22 -3
View File
@@ -10,20 +10,39 @@ elif [ "$verbose" -gt '1' ]; then
set -x
fi
set -e -f -u
# Don't use -f, because we use globs in this script.
set -e -u
log() {
if [ "$verbose" -gt '0' ]; then
# Don't use quotes to get word splitting.
echo "$1" 1>&2
printf '%s\n' "$1" 1>&2
fi
}
log 'starting to build dnsproxy release'
version="${VERSION:-}"
readonly version
if [ -z "$version" ]; then
version="${GITHUB_REF:-}"
version="${version##*/}"
fi
case "$version" in
v*)
if ! printf '%s\n' "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+$' -q; then
printf "version is invalid '%s'\n" "$version" 1>&2
exit 1
fi
;;
*)
version='dev'
;;
esac
readonly version
log "version '$version'"
dist="${DIST_DIR:-build}"