Skip to content
Snippets Groups Projects
Commit 4497f20f authored by Julien Bonjean's avatar Julien Bonjean
Browse files

[#1317] Changed tag convention

parent 46796b77
No related branches found
No related tags found
No related merge requests found
......@@ -220,7 +220,7 @@ if [ ${DO_PREPARE} ]; then
exit -1
fi
VERSION=`cd ${REPOSITORY_DIR} && git describe --tag HEAD | cut -d "/" -f2 | cut -d "-" -f1`
VERSION=`cd ${REPOSITORY_DIR} && git describe --tag HEAD | cut -d "." -f1-3`
if [ ${RELEASE_MODE} ]; then
if [ "${RELEASE_MODE}" != "release" ];then
......
......@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-13
# Last Modified: 2009-05-29 14:23:50 -0400
# Last Modified: 2009-06-22 14:40:21 -0400
#####################################################
# set -x
......@@ -35,7 +35,7 @@ if [ "$?" -ne "0" ]; then
fi
# get last release tag
LAST_RELEASE_TAG_NAME=`git tag -l "debian/*ubuntu*" | grep -E "ubuntu[1-9](\.rc[1-9]|\.beta|\.stable)$" | tail -n 1`
LAST_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 1`
if [ "$?" -ne "0" ]; then
echo " !! Error when retrieving last tag"
......@@ -43,7 +43,7 @@ if [ "$?" -ne "0" ]; then
fi
# get last release tag
PREVIOUS_RELEASE_TAG_NAME=`git tag -l "debian/*ubuntu*" | grep -E "ubuntu[1-9](\.rc[1-9]|\.beta|\.stable)$" | tail -n 2 | sed -n '1p;1q'`
PREVIOUS_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 2 | sed -n '1p;1q'`
if [ "$?" -ne "0" ]; then
echo " !! Error when retrieving previous revision tag"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment