Commit 26b840c1 authored by eric pellegrini's avatar eric pellegrini
Browse files

Merge branch 'develop' of ssh://code.ill.fr/scientific-software/mdanse into develop

parents 6a44aa32 ad6809e2
Pipeline #1057 passed with stages
in 14 minutes and 25 seconds
...@@ -4,7 +4,6 @@ stages: ...@@ -4,7 +4,6 @@ stages:
- deploy - deploy
# trusty pipeline # trusty pipeline
build:trusty: build:trusty:
stage: build stage: build
script: script:
......
...@@ -11,10 +11,16 @@ ROUGE="\\033[1;31m" ...@@ -11,10 +11,16 @@ ROUGE="\\033[1;31m"
BLEU="\\033[1;34m" BLEU="\\033[1;34m"
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py` VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [ "${CI_BUILD_REF_NAME}" == "develop" ]
if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
then then
if [ -n "${WEEKLY_BUILD}" ]
then
VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD` VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi fi
export VERSION_NAME export VERSION_NAME
##Select the build target ##Select the build target
......
...@@ -17,10 +17,9 @@ if [[ ${CI_BUILD_REF_NAME} =~ develop ]] ...@@ -17,10 +17,9 @@ if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
then then
if [ -n "${WEEKLY_BUILD}" ] if [ -n "${WEEKLY_BUILD}" ]
then then
VERSION_NAME=${VERSION_NAME}-"weekly-build-"`date +%Y-%m-%d` VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
else
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi fi
##Select the build target ##Select the build target
......
...@@ -13,11 +13,18 @@ else ...@@ -13,11 +13,18 @@ else
fi fi
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py` VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [ "${CI_BUILD_REF_NAME}" == "develop" ]
if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
then then
if [ -n "${WEEKLY_BUILD}" ]
then
VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD` VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi fi
##Which versions of external programs to use ##Which versions of external programs to use
PYTHON_VERSION=2.7.6 PYTHON_VERSION=2.7.6
......
version 1.0: version 1.0:
- first release - first release
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