From 121a191d5ecd24818053a39013608e424a36142a Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Wed, 31 Mar 2021 16:04:27 +0200 Subject: [PATCH] Fix the package version _on_ prerelease tags Closes #9842 --- builder-support/gen-version | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builder-support/gen-version b/builder-support/gen-version index 4411794d72..c2a56b451b 100755 --- a/builder-support/gen-version +++ b/builder-support/gen-version @@ -37,6 +37,9 @@ if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then LAST_TAG="$(echo ${GIT_VERSION} | cut -d- -f1-2)" COMMITS_SINCE_TAG="$(echo ${GIT_VERSION} | cut -d- -f3)" GIT_HASH="$(echo ${GIT_VERSION} | cut -d- -f4)" + elif [ $(echo ${GIT_VERSION} | awk -F"-" '{print NF-1}') = '1' ]; then + # Exactly on a pre-release + LAST_TAG="$(echo ${GIT_VERSION} | cut -d- -f1-2)" else LAST_TAG="$(echo ${GIT_VERSION} | cut -d- -f1)" COMMITS_SINCE_TAG="$(echo ${GIT_VERSION} | cut -d- -f2)" -- 2.47.2