Commit cf60bf2d authored by eric pellegrini's avatar eric pellegrini
Browse files

Merge tag 'test' into develop

test
parents 7ba6bf5d 60b8c846
Pipeline #953 canceled with stages
in 44 seconds
......@@ -10,6 +10,9 @@ build:trusty:
script:
- ./BuildServer/Debian/run_build.sh
allow_failure: false
only:
- tags
- develop
artifacts:
paths:
- build
......@@ -21,17 +24,20 @@ test:trusty:
script:
- ./BuildServer/Debian/run_tests.sh
allow_failure: false
tags:
- ubuntu14.04
only:
- tags
- develop
dependencies:
- build:trusty
tags:
- ubuntu14.04
deploy:trusty:
stage: deploy
script:
- ./BuildServer/Debian/run_deploy.sh amd64 trusty
only:
- master
- tags
- develop
when: on_success
artifacts:
......@@ -42,81 +48,81 @@ deploy:trusty:
# osx pipeline
build:osx:
stage: build
script:
- ./BuildServer/Darwin/Scripts/run_build.sh
allow_failure: false
artifacts:
paths:
- build
tags:
- mac
#build:osx:
# stage: build
# script:
# - ./BuildServer/Darwin/Scripts/run_build.sh
# allow_failure: false
# artifacts:
# paths:
# - build
# tags:
# - mac
test:osx:
stage: test
script:
- ./BuildServer/Darwin/Scripts/run_tests.sh
allow_failure: false
tags:
- mac
dependencies:
- build:osx
#test:osx:
# stage: test
# script:
# - ./BuildServer/Darwin/Scripts/run_tests.sh
# allow_failure: false
# tags:
# - mac
# dependencies:
# - build:osx
deploy:osx:
stage: deploy
script:
- ./BuildServer/Darwin/Scripts/run_deploy.sh
only:
- master
- develop
when: on_success
artifacts:
paths:
- BuildServer/Darwin/Build/*.dmg
tags:
- mac
#deploy:osx:
# stage: deploy
# script:
# - ./BuildServer/Darwin/Scripts/run_deploy.sh
# only:
# - master
# - develop
# when: on_success
# artifacts:
# paths:
# - BuildServer/Darwin/Build/*.dmg
# tags:
# - mac
# # windows 7 pipeline
build:windows:
stage: build
script:
- c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_build.sh"
- c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_build.sh"
- c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_build.sh"
allow_failure: false
artifacts:
paths:
- .\BuildServer\Windows\Build
tags:
- windows
#build:windows:
# stage: build
# script:
# - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_build.sh"
# - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_build.sh"
# - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_build.sh"
# allow_failure: false
# artifacts:
# paths:
# - .\BuildServer\Windows\Build
# tags:
# - windows
test:windows:
stage: test
script:
- c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_tests.sh"
- c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_tests.sh"
- c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_tests.sh"
allow_failure: false
tags:
- windows
dependencies:
- build:windows
#test:windows:
# stage: test
# script:
# - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_tests.sh"
# - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_tests.sh"
# - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_tests.sh"
# allow_failure: false
# tags:
# - windows
# dependencies:
# - build:windows
deploy:windows:
stage: deploy
script:
- c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_deploy.sh"
- c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_deploy.sh"
- c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_deploy.sh"
only:
- master
- develop
when: on_success
artifacts:
paths:
- BuildServer/Windows/Build/MDANSE*.exe
tags:
- windows
#deploy:windows:
# stage: deploy
# script:
# - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_deploy.sh"
# - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_deploy.sh"
# - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_deploy.sh"
# only:
# - master
# - develop
# when: on_success
# artifacts:
# paths:
# - BuildServer/Windows/Build/MDANSE*.exe
# tags:
# - windows
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