Commit 70505710 authored by Remi Perenon's avatar Remi Perenon
Browse files

Modify yaml file to ensure builds and tests are performed in the same stage

parent ed6aa2c3
Pipeline #3430 failed
stages: stages:
- build - build_and_test
- test - test
- deploy - deploy
# trusty pipeline # trusty pipeline
build_and_test:trusty: build:trusty:
stage: build stage: build_and_test
script: script:
- ./BuildServer/Debian/run_build.sh - ./BuildServer/Debian/run_build.sh
allow_failure: false allow_failure: false
...@@ -24,7 +24,8 @@ build_and_test:trusty: ...@@ -24,7 +24,8 @@ build_and_test:trusty:
tags: tags:
- ubuntu14.04 - ubuntu14.04
stage: test test:trusty:
stage: build_and_test
script: script:
- ./BuildServer/Debian/run_tests.sh - ./BuildServer/Debian/run_tests.sh
allow_failure: false allow_failure: false
...@@ -59,7 +60,7 @@ deploy:trusty: ...@@ -59,7 +60,7 @@ deploy:trusty:
# osx pipeline # osx pipeline
build:osx: build:osx:
stage: build stage: build_and_test
script: script:
- ./BuildServer/Darwin/Scripts/run_build.sh - ./BuildServer/Darwin/Scripts/run_build.sh
allow_failure: false allow_failure: false
...@@ -79,7 +80,7 @@ build:osx: ...@@ -79,7 +80,7 @@ build:osx:
- macmini2 - macmini2
test:osx: test:osx:
stage: test stage: build_and_test
script: script:
- ./BuildServer/Darwin/Scripts/run_tests.sh - ./BuildServer/Darwin/Scripts/run_tests.sh
allow_failure: false allow_failure: false
...@@ -114,7 +115,7 @@ deploy:osx: ...@@ -114,7 +115,7 @@ deploy:osx:
# # windows 7 pipeline # # windows 7 pipeline
build:windows: build:windows:
stage: build stage: build_and_test
script: script:
- c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_build.sh" - 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 "chmod a+x ./BuildServer/Windows/run_build.sh"
...@@ -136,7 +137,7 @@ build:windows: ...@@ -136,7 +137,7 @@ build:windows:
- windows - windows
test:windows: test:windows:
stage: test stage: build_and_test
script: script:
- c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_tests.sh" - 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 "chmod a+x ./BuildServer/Windows/run_tests.sh"
......
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