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

.gitlab-ci.yml

@@ -4,7 +4,6 @@ stages:
   - deploy
  
 # trusty pipeline
-
 build:trusty:
   stage: build
   script:

BuildServer/Darwin/Scripts/run_deploy.sh

@@ -11,10 +11,16 @@ ROUGE="\\033[1;31m"
 BLEU="\\033[1;34m"
 
 VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
-if [ "${CI_BUILD_REF_NAME}" == "develop" ]
+
+if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
 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`
 fi
+
 export VERSION_NAME
 
 ##Select the build target

BuildServer/Debian/run_deploy.sh

@@ -17,10 +17,9 @@ if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
 then
     if [ -n "${WEEKLY_BUILD}" ]
     then
-        VERSION_NAME=${VERSION_NAME}-"weekly-build-"`date +%Y-%m-%d`
-    else
-        VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
+        VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
     fi
+    VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
 fi
 
 ##Select the build target

BuildServer/Windows/run_deploy.sh

@@ -13,11 +13,18 @@ else
 fi
 
 VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
-if [ "${CI_BUILD_REF_NAME}" == "develop" ]
+
+if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
 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`
 fi
 
+
+
 ##Which versions of external programs to use
 PYTHON_VERSION=2.7.6
 

CHANGELOG

 version 1.0:
-    - first release
+   - first release