From 822d098caae4f05b2983adcfb02866cdbd5f5dee Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Mon, 15 May 2017 16:40:45 +0200 Subject: [PATCH] Next fix --- .travis.yml | 96 +++++++++++++++++++-------------------- travis/generate_travis.py | 8 ++-- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ebd611c6..4c121fe41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultDebug BuildDep before_cache: docker cp storm:/storm/. . @@ -47,9 +47,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultDebug BuildLib before_cache: docker cp storm:/storm/. . @@ -57,9 +57,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultDebug BuildAll before_cache: docker cp storm:/storm/. . @@ -67,9 +67,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultDebug TestAll before_cache: docker cp storm:/storm/. . @@ -77,9 +77,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultRelease BuildDep before_cache: docker cp storm:/storm/. . @@ -87,9 +87,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultRelease BuildLib before_cache: docker cp storm:/storm/. . @@ -97,9 +97,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultRelease BuildAll before_cache: docker cp storm:/storm/. . @@ -107,9 +107,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; travis/postsubmit.sh DefaultRelease TestAll before_cache: docker cp storm:/storm/. . @@ -122,9 +122,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultDebug BuildDep before_cache: docker cp storm:/storm/. . @@ -132,9 +132,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultDebug BuildLib before_cache: docker cp storm:/storm/. . @@ -142,9 +142,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultDebug BuildAll before_cache: docker cp storm:/storm/. . @@ -152,9 +152,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultDebug TestAll before_cache: docker cp storm:/storm/. . @@ -162,9 +162,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultRelease BuildDep before_cache: docker cp storm:/storm/. . @@ -172,9 +172,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultRelease BuildLib before_cache: docker cp storm:/storm/. . @@ -182,9 +182,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultRelease BuildAll before_cache: docker cp storm:/storm/. . @@ -192,9 +192,9 @@ matrix: os: linux compiler: gcc env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9 - install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/install_linux.sh - script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9' + script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9'; travis/postsubmit.sh DefaultRelease TestAll before_cache: docker cp storm:/storm/. . @@ -207,64 +207,64 @@ matrix: os: osx compiler: clang env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultDebug BuildDep - stage: Build library os: osx compiler: clang env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultDebug BuildLib - stage: Build all os: osx compiler: clang env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultDebug BuildAll - stage: Test all os: osx compiler: clang env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultDebug TestAll - stage: Build dependencies os: osx compiler: clang env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultRelease BuildDep - stage: Build library os: osx compiler: clang env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultRelease BuildLib - stage: Build all os: osx compiler: clang env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultRelease BuildAll - stage: Test all os: osx compiler: clang env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++ - install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/install_osx.sh - script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++' + script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; travis/postsubmit.sh DefaultRelease TestAll diff --git a/travis/generate_travis.py b/travis/generate_travis.py index 6c9ee4d13..4342b64d7 100644 --- a/travis/generate_travis.py +++ b/travis/generate_travis.py @@ -77,9 +77,9 @@ if __name__ == "__main__": s += " os: linux\n" s += " compiler: {}\n".format(config[1]) s += " env: BUILD={} COMPILER={} LINUX={}\n".format(build, compiler, linux) - s += " install: export OS=linux; export COMPILER='{}'; export LINUX='{}'\n".format(compiler, linux) + s += " install: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux) s += " travis/install_linux.sh\n" - s += " script: export OS=linux; export COMPILER='{}'; export LINUX='{}'\n".format(compiler, linux) + s += " script: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux) s += " travis/postsubmit.sh {} {}\n".format(build, stage[1]) s += " before_cache:\n" s += " docker cp storm:/storm/. .\n" @@ -99,9 +99,9 @@ if __name__ == "__main__": s += " os: osx\n" s += " compiler: {}\n".format(config[1]) s += " env: BUILD={} COMPILER={} STL=libc++\n".format(build, compiler) - s += " install: export OS=osx; export COMPILER='{}'; export STL='libc++'\n".format(compiler) + s += " install: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler) s += " travis/install_osx.sh\n" - s += " script: export OS=osx; export COMPILER='{}'; export STL='libc++'\n".format(compiler) + s += " script: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler) s += " travis/postsubmit.sh {} {}\n".format(build, stage[1]) print(s)