From 3c8f9a2ecf1f87569cc262d6d374c11377acc886 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Wed, 30 Aug 2017 14:46:02 +0200 Subject: [PATCH] Added 5th build stage --- .travis.yml | 51 +++++++++++++++++++++++++++++++++++++++ travis/build-helper.sh | 4 +-- travis/build.sh | 4 +-- travis/generate_travis.py | 1 + 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c824cddf6..2b5f50657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -243,6 +243,57 @@ jobs: after_failure: - find build -iname '*err*.log' -type f -print -exec cat {} \; + ### + # Stage: Build (5th run) + ### + + # osx + - stage: Build (5th run) + os: osx + compiler: clang + env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++ + install: + - travis/install_osx.sh + script: + - travis/build.sh BuildLast + after_failure: + - find build -iname '*err*.log' -type f -print -exec cat {} \; + - stage: Build (5th run) + os: osx + compiler: clang + env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++ + install: + - travis/install_osx.sh + script: + - travis/build.sh BuildLast + after_failure: + - find build -iname '*err*.log' -type f -print -exec cat {} \; + # ubuntu-16.10 + - stage: Build (5th run) + os: linux + compiler: gcc + env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6 + install: + - travis/install_linux.sh + script: + - travis/build.sh BuildLast + before_cache: + - docker cp storm:/storm/. . + after_failure: + - find build -iname '*err*.log' -type f -print -exec cat {} \; + - stage: Build (5th run) + os: linux + compiler: gcc + env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6 + install: + - travis/install_linux.sh + script: + - travis/build.sh BuildLast + before_cache: + - docker cp storm:/storm/. . + after_failure: + - find build -iname '*err*.log' -type f -print -exec cat {} \; + ### # Stage: Test all ### diff --git a/travis/build-helper.sh b/travis/build-helper.sh index c6f2dff60..8d73c87e7 100755 --- a/travis/build-helper.sh +++ b/travis/build-helper.sh @@ -13,7 +13,7 @@ travis_fold() { # Helper for distinguishing between different runs run() { case "$1" in - Build1 | Build2 | Build3 | Build4) + Build*) if [[ "$1" == "Build1" ]] then # CMake @@ -38,7 +38,7 @@ run() { make -j$N_JOBS travis_fold end make # Set skip-file - if [[ "$1" != "Build4" ]] + if [[ "$1" != "BuildLast" ]] then touch skip.txt else diff --git a/travis/build.sh b/travis/build.sh index 0b7900e70..668e4f18e 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -13,7 +13,7 @@ EXITCODE=42 if [ -f build/skip.txt ] then # Remove flag s.t. tests will be executed - if [[ "$1" == "Build4" ]] + if [[ "$1" == "BuildLast" ]] then rm build/skip.txt fi @@ -63,7 +63,7 @@ osx) exit 1 esac -if [[ $EXITCODE == 124 ]] && [[ "$1" == Build* ]] && [[ "$1" != "Build4" ]] +if [[ $EXITCODE == 124 ]] && [[ "$1" == Build* ]] && [[ "$1" != "BuildLast" ]] then exit 0 else diff --git a/travis/generate_travis.py b/travis/generate_travis.py index c47afac0c..14e058a85 100644 --- a/travis/generate_travis.py +++ b/travis/generate_travis.py @@ -24,6 +24,7 @@ stages = [ ("Build (2nd run)", "Build2"), ("Build (3rd run)", "Build3"), ("Build (4th run)", "Build4"), + ("Build (5th run)", "BuildLast"), ("Test all", "TestAll"), ]