Skip to content
Snippets Groups Projects
Commit 74a97294 authored by Emmanuel Milou's avatar Emmanuel Milou Committed by Tristan Matthews
Browse files

release: update release script to checkout the release tag

It is better to get rid of the release branch and use the tag instead to
build the packages. This is a quick first draft that should work for
1.4.0, but it needs to be reworked a little before the next release.

Refs #51465

Change-Id: I26840fe86a9e85e7d64b97b3095a7b19a5427520
parent a0f7803f
No related branches found
No related tags found
Loading
...@@ -131,10 +131,11 @@ fi ...@@ -131,10 +131,11 @@ fi
cd ${REFERENCE_REPOSITORY} cd ${REFERENCE_REPOSITORY}
echo "Update reference sources" echo "Update reference sources"
if [ ${IS_RELEASE} ]; then
git checkout . && git checkout -f release && git pull
else
git checkout . && git checkout -f master && git pull git checkout . && git checkout -f master && git pull
# If release, checkout the latest tag
if [ ${IS_RELEASE} ]; then
git checkout ${VERSION_NUMBER}
fi fi
echo "Retrieve build info" echo "Retrieve build info"
...@@ -143,8 +144,11 @@ if [ ${IS_KDE_CLIENT} ]; then ...@@ -143,8 +144,11 @@ if [ ${IS_KDE_CLIENT} ]; then
TAG_NAME_PREFIX="kde." TAG_NAME_PREFIX="kde."
LAUNCHPAD_PACKAGES=( "sflphone-kde" ) LAUNCHPAD_PACKAGES=( "sflphone-kde" )
fi fi
# Get the version
CURRENT_RELEASE_TAG_NAME=`git describe --tags --abbrev=0` CURRENT_RELEASE_TAG_NAME=`git describe --tags --abbrev=0`
PREVIOUS_RELEASE_TAG_NAME=`git describe --tags --abbrev=0 ${CURRENT_RELEASE_TAG_NAME}^` 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` 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` 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_COMMIT=`git show --pretty=format:"%H" -s | tail -n 1`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment