Commit b93aeceb authored by eric pellegrini's avatar eric pellegrini

Progresses in gitflow implementation

parent bdd0084f
Pipeline #666 canceled with stages
in 2 minutes and 25 seconds
......@@ -10,18 +10,7 @@
ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
if [ -n "${RUN_NIGHTLY_BUILD}" ]
then
VERSION_NAME="devel"
else
if [[ ${CI_BUILD_TAG} =~ ^v([0-9]+\.[0-9]+\.[0-9]+)$ ]]
then
VERSION_NAME=${BASH_REMATCH[1]}
else
echo -e "$ROUGE""Invalid version number ${CI_BUILD_TAG}" "$NORMAL"
exit
fi
fi
VERSION_NAME=`python -c "execfile('MDANSE/__pkginfo__.py') ; print __version__`
export VERSION_NAME
##Select the build target
......
......@@ -11,24 +11,14 @@ export DISTRO=$2
ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
if [ -n "${RUN_NIGHTLY_BUILD}" ]
then
VERSION_NAME="devel"
else
if [[ $CI_BUILD_TAG =~ ^v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
VERSION_NAME=${BASH_REMATCH[1]}
else
echo -e "$ROUGE""Invalid version number ${CI_BUILD_TAG}" "$NORMAL"
exit
fi
fi
##Select the build target
BUILD_TARGET=debian
cd
cd $CI_PROJECT_DIR
VERSION_NAME=`python -c "execfile('MDANSE/__pkginfo__.py') ; print __version__`
# Get revision number from git (without trailing newline)
REV_NUMBER=$(git rev-list --count HEAD)
echo -e "$BLEU""Revision number = ${REV_NUMBER}<--" "$NORMAL"
......
......@@ -10,19 +10,7 @@ else
BUILD_TARGET=$1
fi
if [ -n "${RUN_NIGHTLY_BUILD}" ]
then
VERSION_NAME="devel"
else
echo ${CI_BUILD_TAG}
if [[ ${CI_BUILD_TAG} =~ ^v([0-9]+\.[0-9]+\.[0-9]+)$ ]]
then
VERSION_NAME=${BASH_REMATCH[1]}
else
echo "Invalid version number ${CI_BUILD_TAG}"
exit
fi
fi
VERSION_NAME=`python -c "execfile('MDANSE\__pkginfo__.py') ; print __version__`
if [ "$BUILD_TARGET" = "win32" ]; then
PYTHON_SUFFIX=""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment