fix: get current tag and use for git archive

ElektraInitiative · May 21, 2023 · 850e11d · 850e11d
1 parent c5f1966
commit 850e11d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -285,6 +285,7 @@ This section keeps you up-to-date with the multi-language support provided by El
 
 - Exclude v prefix from `populate-release-notes.sh` script _(Tomislav Makar @tmakar)_
 - Handle tag prefix `v` correctly in `release.sh` _(Tomislav Makar @tmakar)_
+- Check for `v` prefix in `make-source-package` script and `Jenkinsfile.release` _(Tomislav Makar @tmakar)_
 
 ## Documentation
 

diff --git a/scripts/make-source-package.in b/scripts/make-source-package.in
@@ -2,11 +2,8 @@
 
 set +ex
 
-if ["${KDB_VERSION}" = v*]; then
-	git archive --prefix=elektra-"${KDB_VERSION}"/ --format=tar "v${KDB_VERSION}" | gzip --no-name > "${CMAKE_BINARY_DIR}"/elektra-"${KDB_VERSION}".tar.gz
-else
-	git archive --prefix=elektra-"${KDB_VERSION}"/ --format=tar "${KDB_VERSION}" | gzip --no-name > "${CMAKE_BINARY_DIR}"/elektra-"${KDB_VERSION}".tar.gz
-fi
+CURRENT_TAG=$(git tag --sort=version:refname --list | grep -e '[0-9].[0-9].[0-9]*' | tail -n1)
+git archive --prefix=elektra-"${KDB_VERSION}"/ --format=tar $CURRENT_TAG | gzip --no-name > "${CMAKE_BINARY_DIR}"/elektra-"${KDB_VERSION}".tar.gz
 
 hashsum() {
 	printf "name: "