From fc023f514979a244b7d8cb0d85509a1ece4493cd Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 18 Jul 2014 11:51:36 -0400
Subject: [PATCH] jenkins: use last tag for release, not current version.
Refs #51465
Change-Id: I7d58edbdd3e3e1952d8e95fa8c522c3a847a7cbf
---
.../launch-build-machine-jenkins.sh | 25 ++++++++++---------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index 9891a5f2b8..e3740e2430 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -133,18 +133,6 @@ cd ${REFERENCE_REPOSITORY}
echo "Update reference sources"
git checkout . && git checkout -f master && git pull
-# If release, checkout the latest tag
-if [ ${IS_RELEASE} ]; then
- git checkout ${VERSION_NUMBER}
-fi
-
-echo "Retrieve build info"
-# retrieve info we may need
-if [ ${IS_KDE_CLIENT} ]; then
- TAG_NAME_PREFIX="kde."
- LAUNCHPAD_PACKAGES=( "sflphone-kde" )
-fi
-
# 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}^`
@@ -164,6 +152,19 @@ else
PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME}
fi
+# If release, checkout the latest tag
+if [ ${IS_RELEASE} ]; then
+ git checkout ${CURRENT_RELEASE_TAG_NAME}
+fi
+
+echo "Retrieve build info"
+# retrieve info we may need
+if [ ${IS_KDE_CLIENT} ]; then
+ TAG_NAME_PREFIX="kde."
+ LAUNCHPAD_PACKAGES=( "sflphone-kde" )
+fi
+
+
cd ${LAUNCHPAD_DIR}
COMMIT_HASH_BEGIN=""
--
GitLab