Commit 60b8c846 authored by eric pellegrini's avatar eric pellegrini
Browse files

Merge branch 'release-test'

parents 59534bf6 e90291f3
Pipeline #952 canceled with stages
in 1 minute and 38 seconds
...@@ -10,6 +10,9 @@ build:trusty: ...@@ -10,6 +10,9 @@ build:trusty:
script: script:
- ./BuildServer/Debian/run_build.sh - ./BuildServer/Debian/run_build.sh
allow_failure: false allow_failure: false
only:
- tags
- develop
artifacts: artifacts:
paths: paths:
- build - build
...@@ -21,17 +24,20 @@ test:trusty: ...@@ -21,17 +24,20 @@ test:trusty:
script: script:
- ./BuildServer/Debian/run_tests.sh - ./BuildServer/Debian/run_tests.sh
allow_failure: false allow_failure: false
tags: only:
- ubuntu14.04 - tags
- develop
dependencies: dependencies:
- build:trusty - build:trusty
tags:
- ubuntu14.04
deploy:trusty: deploy:trusty:
stage: deploy stage: deploy
script: script:
- ./BuildServer/Debian/run_deploy.sh amd64 trusty - ./BuildServer/Debian/run_deploy.sh amd64 trusty
only: only:
- master - tags
- develop - develop
when: on_success when: on_success
artifacts: artifacts:
......
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