From 3f153ea7cbcbad9c5eaf96fb274eedf88481b842 Mon Sep 17 00:00:00 2001 From: Maksim Kazantsev Date: Fri, 17 Apr 2026 14:33:32 +0000 Subject: [PATCH] Pull request 2636: AGDNS-3914-increase-snapcraft-build-stability Squashed commit of the following: commit 689c4bdc8bb1639572e25e630d1cbfbd6f807f7f Author: Maksim Kazantsev Date: Fri Apr 17 15:33:43 2026 +0300 snap: imp download.sh commit 0dec7e32d3888a04042e1e7390921a1b64048ac5 Author: Maksim Kazantsev Date: Fri Apr 17 15:16:03 2026 +0300 all: rm result file; commit 6884679c6dd011138f8c05e4550428ec3b7fde3c Author: Maksim Kazantsev Date: Fri Apr 17 15:11:52 2026 +0300 snap: imp download.sh commit 1412a0b66bf63bcad312568c496a9c3bef0a16ef Author: Maksim Kazantsev Date: Thu Apr 16 20:06:09 2026 +0300 snap: use query param; commit 40c199d22754f201586f3c8ed3177465ac758060 Author: Maksim Kazantsev Date: Thu Apr 16 19:53:53 2026 +0300 docker: set cache buster env; commit 8bbde2221017074f23bc23b6b2ab3562af4e719a Author: Maksim Kazantsev Date: Thu Apr 16 19:51:41 2026 +0300 all: rm .tar.gz commit 827f51d8710e7b417016ed31d9b17461ce2c28b4 Author: Maksim Kazantsev Date: Thu Apr 16 19:49:52 2026 +0300 snap: fix script; commit ff439b787122e9082472e56b1ca32b0ba632e5b9 Author: Maksim Kazantsev Date: Thu Apr 16 19:46:49 2026 +0300 snap: add cache buster url param; --- docker/snapcraft.Dockerfile | 1 + scripts/snap/download.sh | 7 +++++++ 2 files changed, 8 insertions(+) mode change 100644 => 100755 scripts/snap/download.sh diff --git a/docker/snapcraft.Dockerfile b/docker/snapcraft.Dockerfile index 6340aa394..a0e7709f1 100644 --- a/docker/snapcraft.Dockerfile +++ b/docker/snapcraft.Dockerfile @@ -46,6 +46,7 @@ export VERBOSE='1' env \ CHANNEL="${CHANNEL}" \ + CACHE_BUSTER="${CACHE_BUSTER}" \ sh ./scripts/snap/download.sh \ ; diff --git a/scripts/snap/download.sh b/scripts/snap/download.sh old mode 100644 new mode 100755 index 2a0cef496..6c03a58c2 --- a/scripts/snap/download.sh +++ b/scripts/snap/download.sh @@ -11,10 +11,17 @@ set -e -f -u channel="${CHANNEL:?please set CHANNEL}" readonly channel +cache_buster="${CACHE_BUSTER:-0}" +readonly cache_buster + while read -r arch snap_arch; do release_url="https://static.adtidy.org/adguardhome/${channel}/AdGuardHome_linux_${arch}.tar.gz" output="./AdGuardHome_linux_${arch}.tar.gz" + if [ -n "$cache_buster" ]; then + release_url="${release_url}?cache_buster=${cache_buster}" + fi + curl -o "$output" -v "$release_url" tar -f "$output" -v -x -z cp ./AdGuardHome/AdGuardHome "./AdGuardHome_${snap_arch}"