Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

archrelease: fix git tag conversion and use library function for it 

This allows us to reuse the code and have the conversion in a single
place instead of cluttering rules across different execution units.

It also fixes the implementations according to the specs of
git-check-ref-format.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
This commit is contained in:
Levente Polyak 2022-09-11 12:31:39 +02:00
parent 1844418956
commit b9d20c10a9
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/common.sh
View File

@ -255,6 +255,16 @@ getpkgdesc() {
}
get_tag_from_pkgver() {
local pkgver=$1
local tag=${pkgver}
tag=${tag/:/-}
tag=${tag//~/.}
echo "${tag}"
}
is_debug_package() {
local pkgfile=${1} pkgbase pkgname pkgdesc
pkgbase="$(getpkgbase "${pkgfile}")"

13
src/archrelease.in
View File

@ -37,17 +37,17 @@ fi
. ./PKGBUILD
pkgbase=${pkgbase:-$pkgname}
pkgver=$(get_full_version "$pkgbase")
tag_pkgver=release-${pkgver/:/-}
gittag=$(get_tag_from_pkgver "$pkgver")
if git rev-parse "$tag_pkgver" >/dev/null 2>&1; then
die "archrelease: the tag $pkgver already exists in the repository!"
if git rev-parse "$gittag" >/dev/null 2>&1; then
die "archrelease: the tag $gittag for version $pkgver already exists in the repository!"
fi
# If the tag exists we check if it's properly signed and that it
# matches the working directory PKGBUILD.
if git tag --verify "$tag_pkgver" &> /dev/null; then
if git tag --verify "$gittag" &> /dev/null; then
cwd_checksum=$(sha256sum PKGBUILD|cut -d' ' -f1)
tag_checksum=$(git show $tag_pkgver:PKGBUILD | sha256sum |cut -d' ' -f1)
tag_checksum=$(git show "${gittag}:PKGBUILD" | sha256sum |cut -d' ' -f1)
if [[ "$cwd_checksum" != "$tag_checksum" ]]; then
die "tagged PKGBUILD is not the same as the working dir PKGBUILD"
fi
@ -55,7 +55,6 @@ if git tag --verify "$tag_pkgver" &> /dev/null; then
fi
stat_busy "Releasing package"
printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }"
git tag -s -m "archrelease: released $pkgbase-$pkgver to $tag_list" "$tag_pkgver" || abort
git tag --sign --message="Package release ${pkgver}" "$gittag" || abort
git push --tags main || abort
stat_done