Commit 42ad4f2a authored by eric pellegrini's avatar eric pellegrini

advances in gitlab-gitflow integration

parent dc7533ee
Pipeline #923 failed with stages
in 1 second
......@@ -5,75 +5,77 @@ stages:
# trusty pipeline
build:trusty:
#build:trusty:
# stage: build
# script:
# - ./BuildServer/Debian/run_build.sh
# allow_failure: false
# artifacts:
# paths:
# - build
# tags:
# - ubuntu14.04
#test:trusty:
# stage: test
# script:
# - ./BuildServer/Debian/run_tests.sh
# allow_failure: false
# tags:
# - ubuntu14.04
# dependencies:
# - build:trusty
#deploy:trusty:
# stage: deploy
# script:
# - ./BuildServer/Debian/run_deploy.sh amd64 trusty
# only:
# - master
# - develop
# when: on_success
# artifacts:
# paths:
# - ./BuildServer/Debian/Build/*.deb
# tags:
# - ubuntu14.04
# osx pipeline
build:osx:
stage: build
script:
- ./BuildServer/Debian/run_build.sh
- ./BuildServer/Darwin/Scripts/run_build.sh
allow_failure: false
tags:
- ubuntu14.04
artifacts:
paths:
- build
tags:
- mac
test:trusty:
test:osx:
stage: test
script:
- ./BuildServer/Debian/run_tests.sh
- cd ./BuildServer/Darwin/Scripts
- ./run_tests.sh
allow_failure: false
tags:
- ubuntu14.04
dependencies:
- build:trusty
- mac
deploy:trusty:
deploy:osx:
stage: deploy
script:
- ./BuildServer/Debian/run_deploy.sh amd64 trusty
- cd ./BuildServer/Darwin/Scripts
- ./run_deploy.sh
only:
- master
- develop
when: on_success
artifacts:
paths:
- ./BuildServer/Debian/Build/*.deb
- BuildServer/Darwin/Build/*.dmg
tags:
- ubuntu14.04
# osx pipeline
# build:osx:
# stage: build
# script:
# - cd ./BuildServer/Darwin/Scripts
# - ./run_build.sh
# allow_failure: false
# tags:
# - mac
# test:osx:
# stage: test
# script:
# - cd ./BuildServer/Darwin/Scripts
# - ./run_tests.sh
# allow_failure: false
# tags:
# - mac
# deploy:osx:
# stage: deploy
# script:
# - cd ./BuildServer/Darwin/Scripts
# - ./run_deploy.sh
# only:
# - tags
# - hotfix-.*
# when: on_success
# artifacts:
# paths:
# - BuildServer/Darwin/Build/*.dmg
# tags:
# - mac
- mac
# # windows 7 pipeline
......
......@@ -10,17 +10,11 @@
ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
VERSION_NAME=`python -c "execfile('MDANSE/__pkginfo__.py') ; print __version__`
export VERSION_NAME
##Select the build target
BUILD_TARGET=darwin
cd ../../../
# Which version name are we appending to the final archive
TARGET_DIR=MDANSE-${VERSION_NAME}-${BUILD_TARGET}
# take the latest version of nmoldyn available on the forge
echo -e "$BLEU""Getting last MDANSE revision" "$NORMAL"
......
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