From a05fb1ecd95f2f16a8545cab9d4aca7bd37ab4b8 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 27 Apr 2024 15:06:07 -0400 Subject: [PATCH] Add AUR as version check / cache invalidation source --- build-image.sh | 3 +++ functions.sh | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/build-image.sh b/build-image.sh index 421a3ed..d5bf54b 100755 --- a/build-image.sh +++ b/build-image.sh @@ -17,6 +17,9 @@ extra_args="" if [ ! -z "${INVALIDATE_CACHE_UPSTREAM_ARCHLINUX+x}" ]; then log "Fetching upstream package version from Arch Linux" upstream_ver="$(get_archlinux_pkg_ver "$INVALIDATE_CACHE_UPSTREAM_ARCHLINUX")" +elif [ ! -z "${INVALIDATE_CACHE_UPSTREAM_AUR+x}" ]; then + log "Fetching upstream package version from AUR" + upstream_ver="$(get_aur_pkg_ver "$INVALIDATE_CACHE_UPSTREAM_AUR")" elif [ ! -z "${INVALIDATE_CACHE_UPSTREAM_UBUNTU+x}" ]; then log "Fetching upstream package version from Ubuntu (Launchpad)" upstream_ver="$(get_ubuntu_pkg_ver "$INVALIDATE_CACHE_UPSTREAM_UBUNTU")" diff --git a/functions.sh b/functions.sh index 8a5e7ae..72ddcca 100644 --- a/functions.sh +++ b/functions.sh @@ -126,6 +126,10 @@ get_archlinux_pkg_ver() { curl https://archlinux.org/packages/$1/json/ 2>/dev/null | jq -r '. | .pkgver + "-" + .pkgrel' } +get_aur_pkg_ver() { + curl "https://aur.archlinux.org/rpc/v5/info?arg[]=$1" 2>/dev/null | jq -r '.results[0].Version' +} + # Note: this does not specify which version of Ubuntu to use, because we don't actually care # this version can and will only used to invalidate Docker cache, and we only need a vague # idea of whether this package has been updated upstream.