Commit 9da02104 authored by Jamie Hall's avatar Jamie Hall
Browse files

Merge branch 'master' into develop

parents 36f48ed0 4ccc7b8d
...@@ -11,40 +11,39 @@ build:trusty: ...@@ -11,40 +11,39 @@ build:trusty:
- ./BuildServer/Debian/run_build.sh - ./BuildServer/Debian/run_build.sh
allow_failure: false allow_failure: false
only: only:
- tags - feature-*
- develop
artifacts: artifacts:
paths: paths:
- build - build
tags: tags:
- ubuntu14.04 - ubuntu14.04
test:trusty: # test:trusty:
stage: test # stage: test
script: # script:
- ./BuildServer/Debian/run_tests.sh # - ./BuildServer/Debian/run_tests.sh
allow_failure: false # allow_failure: false
only: # only:
- tags # - tags
- develop # - develop
dependencies: # dependencies:
- build:trusty # - build:trusty
tags: # tags:
- ubuntu14.04 # - 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:
- tags # - tags
- develop # - develop
when: on_success # when: on_success
artifacts: # artifacts:
paths: # paths:
- ./BuildServer/Debian/Build/*.deb # - ./BuildServer/Debian/Build/*.deb
tags: # tags:
- ubuntu14.04 # - ubuntu14.04
# osx pipeline # osx pipeline
......
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