Commit 261528ef authored by eric pellegrini's avatar eric pellegrini

advances in gitlab-gitflow integration

parent f60d9e7c
Pipeline #911 canceled with stages
in 1 minute and 13 seconds
......@@ -4,6 +4,7 @@ stages:
- deploy
# trusty pipeline
build:trusty:
stage: build
script:
......@@ -14,6 +15,7 @@ build:trusty:
artifacts:
paths:
- build
test:trusty:
stage: test
script:
......@@ -31,6 +33,7 @@ deploy:trusty:
only:
- tags
- hotfix-.*
- develop
when: on_success
artifacts:
paths:
......@@ -38,7 +41,6 @@ deploy:trusty:
tags:
- ubuntu14.04
# osx pipeline
# build:osx:
......
......@@ -7,20 +7,12 @@ export DISTRO=$2
# CONFIGURATION
#############################
echo "BUID REF NAME --> ${CI_BUILD_REF_NAME}"
## Add some colors
ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
##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"
......
......@@ -11,16 +11,11 @@ export DISTRO=$2
ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
if [ -n "${RUN_NIGHTLY_BUILD}" ]
if [ -n "${CI_BUILD_REF_NAME}" ]
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
VERSION_NAME=`sed -n "sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' __pkginfo__.py" MDANSE/__pkginfo__.py`
fi
##Select the build target
......
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