diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh index 4ac83f90be9e8347e83754153e120ea822ed83e5..9891a5f2b898a70a98690df3761698dbb5e6c26a 100755 --- a/tools/build-system/launch-build-machine-jenkins.sh +++ b/tools/build-system/launch-build-machine-jenkins.sh @@ -131,10 +131,11 @@ fi 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 . && git checkout -f release && git pull -else - git checkout . && git checkout -f master && git pull + git checkout ${VERSION_NUMBER} fi echo "Retrieve build info" @@ -143,8 +144,11 @@ 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}^` + 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`