From 16405fe33ef1e45a7038df9ba66ba88cf0042c6c Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Thu, 11 Apr 2024 16:08:38 -0400 Subject: 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 --- contrib/ci/jobs/3-wallet-cli-deb-package/version.sh | 2 +- contrib/ci/jobs/4-taler-harness-deb-package/version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/ci') diff --git a/contrib/ci/jobs/3-wallet-cli-deb-package/version.sh b/contrib/ci/jobs/3-wallet-cli-deb-package/version.sh index a6e740af0..52031b23a 100755 --- a/contrib/ci/jobs/3-wallet-cli-deb-package/version.sh +++ b/contrib/ci/jobs/3-wallet-cli-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 diff --git a/contrib/ci/jobs/4-taler-harness-deb-package/version.sh b/contrib/ci/jobs/4-taler-harness-deb-package/version.sh index a6e740af0..52031b23a 100755 --- a/contrib/ci/jobs/4-taler-harness-deb-package/version.sh +++ b/contrib/ci/jobs/4-taler-harness-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 -- cgit v1.2.3