From 3246c8409bbfbf230e50d5422f3ba5e1a437b14e Mon Sep 17 00:00:00 2001
From: Simon Piette <simon.piette@savoirfairelinux.com>
Date: Thu, 18 Sep 2014 18:27:42 -0400
Subject: [PATCH] build-system: add --tag=x to launch-build-machine-jenkins.sh
Refs #55550
Change-Id: I3949cf3d8f8668727480b419ee6c65a92fdef6d3
---
tools/build-system/launch-build-machine-jenkins.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index 803001c95b..b3940d38e1 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -61,6 +61,8 @@ do
unset DO_LOGGING;;
--release)
IS_RELEASE=1;;
+ --tag)
+ TAG=(${PARAMETER##*=});;
--version-index=*)
VERSION_INDEX=(${PARAMETER##*=});;
*)
@@ -114,14 +116,19 @@ echo "Update reference sources"
git checkout . && git checkout -f master && git pull
# Get the version
-CURRENT_RELEASE_TAG_NAME=`git describe --tags --abbrev=0`
-PREVIOUS_RELEASE_TAG_NAME=`git describe --tags --abbrev=0 ${CURRENT_RELEASE_TAG_NAME}^`
+if [ -n $TAG ]; then
+ CURRENT_RELEASE_TAG_NAME="tags/$TAG"
+else
+ CURRENT_RELEASE_TAG_NAME=`git describe --tags --abbrev=0`
+fi
+PREVIOUS_RELEASE_TAG_NAME=`git describe --tags --abbrev=0 ${CURRENT_RELEASE_TAG_NAME}^`
CURRENT_RELEASE_COMMIT_HASH=`git show --pretty=format:"%H" -s ${CURRENT_RELEASE_TAG_NAME} | tail -n 1`
PREVIOUS_RELEASE_COMMIT_HASH=`git show --pretty=format:"%H" -s ${PREVIOUS_RELEASE_TAG_NAME} | tail -n 1`
CURRENT_COMMIT=`git show --pretty=format:"%H" -s | tail -n 1`
CURRENT_RELEASE_TYPE=${CURRENT_RELEASE_TAG_NAME##*.}
PREVIOUS_RELEASE_TYPE=${PREVIOUS_RELEASE_TAG_NAME##*.}
+
if [ ${IS_KDE_CLIENT} ]; then
CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME%.*}
CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_VERSION#*.}
--
GitLab