Commit 122d71ac authored by eric pellegrini's avatar eric pellegrini
Browse files

advances in gitlab-gitflow integration

parent 244c2265
Pipeline #925 passed with stages
in 5 minutes and 35 seconds
......@@ -56,8 +56,7 @@ build:osx:
test:osx:
stage: test
script:
- cd ./BuildServer/Darwin/Scripts
- ./run_tests.sh
- ./BuildServer/Darwin/Scripts/run_tests.sh
allow_failure: false
tags:
- mac
......@@ -65,8 +64,7 @@ test:osx:
deploy:osx:
stage: deploy
script:
- cd ./BuildServer/Darwin/Scripts
- ./run_deploy.sh
- ./BuildServer/Darwin/Scripts/run_deploy.sh
only:
- master
- develop
......
......@@ -10,25 +10,16 @@
ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
if [ -n "${RUN_NIGHTLY_BUILD}" ]
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [ "${CI_BUILD_REF_NAME}" -eq "develop"]
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=${VERSION_NAME}-`git rev-parse --short HEAD`
fi
export VERSION_NAME
##Select the build target
BUILD_TARGET=darwin
cd ../../../
echo -e "$BLEU""Packaging MDANSE" "$NORMAL"
rm -rf BuildServer/Darwin/Build
mkdir BuildServer/Darwin/Build
......
#!/bin/bash
cd ../../../
ROUGE="\\033[1;31m"
# Performs the unit tests
cd Tests/UnitTests
nosetests --verbosity=3 -P .
# Exit now if unable to run tests
if [ $? -ne 0 ]; then
status = $?
echo -e "$ROUGE""One or several unit tests failed"
exit status
fi
cd ../..
cd Tests/FunctionalTests/Jobs
python BuildJobTests.py
nosetests --verbosity=3 --exe -P .
if [ $? -ne 0 ]; then
status=$?
echo -e "$ROUGE""One or several functional tests failed"
exit status
fi
cd ../../..
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