From b9cb527dae64856985b2e7333a4d3f80580b635c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 08:42:01 -0400 Subject: [PATCH 1/3] ilot/forgejo-aneksajo: change version scheme --- ilot/forgejo-aneksajo/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ilot/forgejo-aneksajo/APKBUILD b/ilot/forgejo-aneksajo/APKBUILD index efca056..a15b68e 100644 --- a/ilot/forgejo-aneksajo/APKBUILD +++ b/ilot/forgejo-aneksajo/APKBUILD @@ -4,9 +4,9 @@ # Contributor: Patrycja Rosa # Maintainer: Antoine Martin (ayakael) pkgname=forgejo-aneksajo -pkgver=8.0.3 -_gittag=v$pkgver-git-annex1 -pkgrel=1 +pkgver=8.0.3_git1 +_gittag=v${pkgver/_git/-git-annex} +pkgrel=2 pkgdesc="Self-hosted Git service written in Go with git-annex support" url="https://forgejo.org" # riscv64: builds fail https://codeberg.org/forgejo/forgejo/issues/3025 -- 2.47.2 From d07957ab63169fc078978f8d9fcdd3c08c99c59f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 08:42:13 -0400 Subject: [PATCH 2/3] forgejo: add special case for forgejo-aneksajo when checking upstream version --- .forgejo/bin/check_ver.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.forgejo/bin/check_ver.sh b/.forgejo/bin/check_ver.sh index e4b7fd7..54cf216 100755 --- a/.forgejo/bin/check_ver.sh +++ b/.forgejo/bin/check_ver.sh @@ -18,6 +18,9 @@ for pkg in $owned_by_you; do downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}') downstream_version=${downstream_version/-*} + # special case for forgejo-aneksajo: + upstream_version=${upstream_version/-git-annex/_git} + if [ -z "$upstream_version" ]; then echo "$pkg not in anitya" echo "$pkg" >> not_in_anitya -- 2.47.2 From eb8242c6f0549b148d2b9731e67c2a99e0839044 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 08:52:42 -0400 Subject: [PATCH 3/3] forgejo: chose highest version when dealing with multiple downstream_versions --- .forgejo/bin/check_ver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/bin/check_ver.sh b/.forgejo/bin/check_ver.sh index 54cf216..66c7fd0 100755 --- a/.forgejo/bin/check_ver.sh +++ b/.forgejo/bin/check_ver.sh @@ -15,7 +15,7 @@ rm -f out_of_date not_in_anitya for pkg in $owned_by_you; do upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].stable_version') - downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}') + downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1) downstream_version=${downstream_version/-*} # special case for forgejo-aneksajo: -- 2.47.2