From b92cac256f715488bc7f6a57ed33b070f894e307 Mon Sep 17 00:00:00 2001 From: MotherSphere Date: Mon, 20 Jul 2026 21:44:41 +0200 Subject: [PATCH] fix(ci): AUR bump compatible with the two-source PKGBUILD (binary + icon) colony-bin now ships the hicolor icon as a second source with its own stable hash. The bump seds targeted the single sha256sums line and would have either matched nothing or clobbered both hashes on the next release: the binary hash now lives in a dedicated _binsha variable, and the .SRCINFO sed replaces only the first sha256sums line. --- .github/workflows/aur-publish.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aur-publish.yml b/.github/workflows/aur-publish.yml index ff5401f..5e8e344 100644 --- a/.github/workflows/aur-publish.yml +++ b/.github/workflows/aur-publish.yml @@ -99,7 +99,9 @@ jobs: # Reset pkgrel to 1 because pkgver changed — standard AUR convention. sed -i "s/^pkgver=.*/pkgver=${PKGVER}/" PKGBUILD sed -i "s/^pkgrel=.*/pkgrel=1/" PKGBUILD - sed -i "s/^sha256sums=('.*')/sha256sums=('${SHA256}')/" PKGBUILD + # The binary hash lives in its own _binsha variable (the icon's + # _iconsha is stable across releases and must not be touched). + sed -i "s/^_binsha=.*/_binsha='${SHA256}'/" PKGBUILD # .SRCINFO mirrors the PKGBUILD metadata. We sed the three fields # that track pkgver (pkgver itself, noextract filename, source URL) @@ -109,7 +111,9 @@ jobs: sed -i "s|noextract = colony-[^[:space:]]*|noextract = colony-${PKGVER}|" .SRCINFO sed -i "s|colony-[0-9.]*::https|colony-${PKGVER}::https|" .SRCINFO sed -i "s|download/v[0-9.]*/colony-linux|download/v${PKGVER}/colony-linux|" .SRCINFO - sed -i "s/^\tsha256sums = .*/\tsha256sums = ${SHA256}/" .SRCINFO + # Only the FIRST sha256sums line is the binary's; the second is the + # stable icon hash. + sed -i "0,/^\tsha256sums = .*/s//\tsha256sums = ${SHA256}/" .SRCINFO echo "--- PKGBUILD diff ---" git --no-pager diff PKGBUILD || true