From 4827d2083c3f1e6135198f2e610bb69c102e36c5 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Tue, 20 Jun 2017 16:43:19 +0200 Subject: [PATCH] Renamed build scripts in travis --- .travis.yml | 60 +++++++++---------- .../{postsubmit-helper.sh => build-helper.sh} | 0 travis/{postsubmit.sh => build.sh} | 4 +- travis/generate_travis.py | 4 +- 4 files changed, 34 insertions(+), 34 deletions(-) rename travis/{postsubmit-helper.sh => build-helper.sh} (100%) rename travis/{postsubmit.sh => build.sh} (91%) diff --git a/.travis.yml b/.travis.yml index e4390bde0..488f541af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultDebug BuildDep + travis/build.sh DefaultDebug BuildDep - stage: Build dependencies os: osx compiler: clang @@ -47,7 +47,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultRelease BuildDep + travis/build.sh DefaultRelease BuildDep # ubuntu-16.10 - stage: Build dependencies os: linux @@ -56,7 +56,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildDep + travis/build.sh DefaultDebug BuildDep before_cache: docker cp storm:/storm/. . - stage: Build dependencies @@ -66,7 +66,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildDep + travis/build.sh DefaultRelease BuildDep before_cache: docker cp storm:/storm/. . # debian-9 @@ -77,7 +77,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildDep + travis/build.sh DefaultDebug BuildDep before_cache: docker cp storm:/storm/. . - stage: Build dependencies @@ -87,7 +87,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildDep + travis/build.sh DefaultRelease BuildDep before_cache: docker cp storm:/storm/. . @@ -103,7 +103,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultDebug BuildLib1 + travis/build.sh DefaultDebug BuildLib1 - stage: Build library (1st run) os: osx compiler: clang @@ -111,7 +111,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultRelease BuildLib1 + travis/build.sh DefaultRelease BuildLib1 # ubuntu-16.10 - stage: Build library (1st run) os: linux @@ -120,7 +120,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildLib1 + travis/build.sh DefaultDebug BuildLib1 before_cache: docker cp storm:/storm/. . - stage: Build library (1st run) @@ -130,7 +130,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildLib1 + travis/build.sh DefaultRelease BuildLib1 before_cache: docker cp storm:/storm/. . # debian-9 @@ -141,7 +141,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildLib1 + travis/build.sh DefaultDebug BuildLib1 before_cache: docker cp storm:/storm/. . - stage: Build library (1st run) @@ -151,7 +151,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildLib1 + travis/build.sh DefaultRelease BuildLib1 before_cache: docker cp storm:/storm/. . @@ -167,7 +167,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultDebug BuildLib + travis/build.sh DefaultDebug BuildLib - stage: Build library (2nd run) os: osx compiler: clang @@ -175,7 +175,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultRelease BuildLib + travis/build.sh DefaultRelease BuildLib # ubuntu-16.10 - stage: Build library (2nd run) os: linux @@ -184,7 +184,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildLib + travis/build.sh DefaultDebug BuildLib before_cache: docker cp storm:/storm/. . - stage: Build library (2nd run) @@ -194,7 +194,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildLib + travis/build.sh DefaultRelease BuildLib before_cache: docker cp storm:/storm/. . # debian-9 @@ -205,7 +205,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildLib + travis/build.sh DefaultDebug BuildLib before_cache: docker cp storm:/storm/. . - stage: Build library (2nd run) @@ -215,7 +215,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildLib + travis/build.sh DefaultRelease BuildLib before_cache: docker cp storm:/storm/. . @@ -231,7 +231,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultDebug BuildAll + travis/build.sh DefaultDebug BuildAll - stage: Build all os: osx compiler: clang @@ -239,7 +239,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultRelease BuildAll + travis/build.sh DefaultRelease BuildAll # ubuntu-16.10 - stage: Build all os: linux @@ -248,7 +248,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildAll + travis/build.sh DefaultDebug BuildAll before_cache: docker cp storm:/storm/. . - stage: Build all @@ -258,7 +258,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildAll + travis/build.sh DefaultRelease BuildAll before_cache: docker cp storm:/storm/. . # debian-9 @@ -269,7 +269,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug BuildAll + travis/build.sh DefaultDebug BuildAll before_cache: docker cp storm:/storm/. . - stage: Build all @@ -279,7 +279,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease BuildAll + travis/build.sh DefaultRelease BuildAll before_cache: docker cp storm:/storm/. . @@ -295,7 +295,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultDebug TestAll + travis/build.sh DefaultDebug TestAll - stage: Test all os: osx compiler: clang @@ -303,7 +303,7 @@ jobs: 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++'; - travis/postsubmit.sh DefaultRelease TestAll + travis/build.sh DefaultRelease TestAll # ubuntu-16.10 - stage: Test all os: linux @@ -312,7 +312,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug TestAll + travis/build.sh DefaultDebug TestAll before_cache: docker cp storm:/storm/. . - stage: Test all @@ -322,7 +322,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease TestAll + travis/build.sh DefaultRelease TestAll before_cache: docker cp storm:/storm/. . # debian-9 @@ -333,7 +333,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultDebug TestAll + travis/build.sh DefaultDebug TestAll before_cache: docker cp storm:/storm/. . - stage: Test all @@ -343,7 +343,7 @@ jobs: 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'; - travis/postsubmit.sh DefaultRelease TestAll + travis/build.sh DefaultRelease TestAll before_cache: docker cp storm:/storm/. . diff --git a/travis/postsubmit-helper.sh b/travis/build-helper.sh similarity index 100% rename from travis/postsubmit-helper.sh rename to travis/build-helper.sh diff --git a/travis/postsubmit.sh b/travis/build.sh similarity index 91% rename from travis/postsubmit.sh rename to travis/build.sh index fa057c3ff..f2abbdd99 100755 --- a/travis/postsubmit.sh +++ b/travis/build.sh @@ -29,7 +29,7 @@ linux) export STLARG=$STLARG; export OS=$OS; cd storm; - travis/postsubmit-helper.sh $1 $2" + travis/build-helper.sh $1 $2" EXITCODE=$? if [ $EXITCODE = 124 ] && [ "$2" = "BuildLib1" ] then @@ -45,7 +45,7 @@ osx) export N_JOBS export STLARG export OS - gtimeout $TIMEOUT travis/postsubmit-helper.sh "$1" "$2" + gtimeout $TIMEOUT travis/build-helper.sh "$1" "$2" EXITCODE=$? if [ $EXITCODE = 124 ] && [ "$2" = "BuildLib1" ] then diff --git a/travis/generate_travis.py b/travis/generate_travis.py index 1f8bb5f94..202ef19ac 100644 --- a/travis/generate_travis.py +++ b/travis/generate_travis.py @@ -81,7 +81,7 @@ if __name__ == "__main__": buildConfig += " install: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler) buildConfig += " travis/install_osx.sh\n" buildConfig += " script: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler) - buildConfig += " travis/postsubmit.sh {} {}\n".format(build, stage[1]) + buildConfig += " travis/build.sh {} {}\n".format(build, stage[1]) s += buildConfig # Linux via Docker @@ -98,7 +98,7 @@ if __name__ == "__main__": buildConfig += " install: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux) buildConfig += " travis/install_linux.sh\n" buildConfig += " script: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux) - buildConfig += " travis/postsubmit.sh {} {}\n".format(build, stage[1]) + buildConfig += " travis/build.sh {} {}\n".format(build, stage[1]) buildConfig += " before_cache:\n" buildConfig += " docker cp storm:/storm/. .\n" s += buildConfig