sync

commit 2a948f5830c15c092f1be8904b017c1c58f027c0
parent 9e9d0f14f7e84c0e23ab707f9c5d49f400b66f84
Author: Devan Carpenter <devan@taler.net>
Date:   Thu, 11 Apr 2024 16:04:21 -0400

ci: exclude dev tags from .deb version strings

this avoids a whole mess of problems with version string parsing and
selection with dpkg and gbh

Diffstat:
M
contrib/ci/jobs/4-deb-package/version.sh
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/ci/jobs/4-deb-package/version.sh b/contrib/ci/jobs/4-deb-package/version.sh
@@ -7,7 +7,7 @@ if [ -z "${BRANCH}" ]; then
 else
         # "Unshallow" our checkout, but only our current branch, and exclude the submodules.
 	git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
-	RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always --abbrev=0 HEAD || exit 1)
+	RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-dev*' --always --abbrev=0 HEAD || exit 1)
 	commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
 	if [ "${commits}" = "0" ]; then
 		git describe --tag HEAD | sed -r 's/^v//' || exit 1