Insert jobs according to stage

8 years ago · 2e02e34f94
2 changed files with 136 additions and 123 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -28,9 +28,10 @@ jobs:
  include:

  ###
-  # ubuntu-16.10
+  # Stage: ('Build dependencies', 'BuildDep')
  ###

+  # ubuntu-16.10
  - stage: Build dependencies
    os: linux
    compiler: gcc
@ -41,44 +42,68 @@ jobs:
      travis/postsubmit.sh DefaultDebug BuildDep
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build library
+  - stage: Build dependencies
    os: linux
    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+    env: BUILD=DefaultRelease COMPILER=gcc-6 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';
-      travis/postsubmit.sh DefaultDebug BuildLib
+      travis/postsubmit.sh DefaultRelease BuildDep
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build all
+  # debian-9
+  - stage: Build dependencies
    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';
+    env: BUILD=DefaultDebug COMPILER=gcc-6 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='ubuntu-16.10';
-      travis/postsubmit.sh DefaultDebug BuildAll
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/postsubmit.sh DefaultDebug BuildDep
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Test all
+  - stage: Build dependencies
    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';
+    env: BUILD=DefaultRelease COMPILER=gcc-6 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='ubuntu-16.10';
-      travis/postsubmit.sh DefaultDebug TestAll
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/postsubmit.sh DefaultRelease BuildDep
    before_cache:
      docker cp storm:/storm/. .
+  # osx
+  - stage: Build dependencies
+    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++';
+      travis/install_osx.sh
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultDebug BuildDep
  - 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++';
+      travis/install_osx.sh
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultRelease BuildDep
+
+  ###
+  # Stage: ('Build library', 'BuildLib')
+  ###
+
+  # ubuntu-16.10
+  - stage: Build library
    os: linux
    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+    env: BUILD=DefaultDebug COMPILER=gcc-6 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';
-      travis/postsubmit.sh DefaultRelease BuildDep
+      travis/postsubmit.sh DefaultDebug BuildLib
    before_cache:
      docker cp storm:/storm/. .
  - stage: Build library
@ -91,51 +116,71 @@ jobs:
      travis/postsubmit.sh DefaultRelease BuildLib
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build all
+  # debian-9
+  - stage: Build library
    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';
+    env: BUILD=DefaultDebug COMPILER=gcc-6 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='ubuntu-16.10';
-      travis/postsubmit.sh DefaultRelease BuildAll
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/postsubmit.sh DefaultDebug BuildLib
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Test all
+  - stage: Build library
    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';
+    env: BUILD=DefaultRelease COMPILER=gcc-6 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='ubuntu-16.10';
-      travis/postsubmit.sh DefaultRelease TestAll
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/postsubmit.sh DefaultRelease BuildLib
    before_cache:
      docker cp storm:/storm/. .
+  # osx
+  - 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++';
+      travis/install_osx.sh
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultDebug BuildLib
+  - 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++';
+      travis/install_osx.sh
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultRelease BuildLib

  ###
-  # debian-9
+  # Stage: ('Build all', 'BuildAll')
  ###

-  - stage: Build dependencies
+  # ubuntu-16.10
+  - stage: Build all
    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';
+    env: BUILD=DefaultDebug COMPILER=gcc-6 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='debian-9';
-      travis/postsubmit.sh DefaultDebug BuildDep
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+      travis/postsubmit.sh DefaultDebug BuildAll
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build library
+  - stage: Build all
    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';
+    env: BUILD=DefaultRelease COMPILER=gcc-6 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='debian-9';
-      travis/postsubmit.sh DefaultDebug BuildLib
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+      travis/postsubmit.sh DefaultRelease BuildAll
    before_cache:
      docker cp storm:/storm/. .
+  # debian-9
  - stage: Build all
    os: linux
    compiler: gcc
@ -146,44 +191,68 @@ jobs:
      travis/postsubmit.sh DefaultDebug BuildAll
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Test all
+  - stage: Build all
    os: linux
    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+    env: BUILD=DefaultRelease COMPILER=gcc-6 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';
-      travis/postsubmit.sh DefaultDebug TestAll
+      travis/postsubmit.sh DefaultRelease BuildAll
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build dependencies
+  # osx
+  - 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++';
+      travis/install_osx.sh
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultDebug BuildAll
+  - 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++';
+      travis/install_osx.sh
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultRelease BuildAll
+
+  ###
+  # Stage: ('Test all', 'TestAll')
+  ###
+
+  # ubuntu-16.10
+  - stage: Test all
    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';
+    env: BUILD=DefaultDebug COMPILER=gcc-6 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='debian-9';
-      travis/postsubmit.sh DefaultRelease BuildDep
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+      travis/postsubmit.sh DefaultDebug TestAll
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build library
+  - stage: Test all
    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';
+    env: BUILD=DefaultRelease COMPILER=gcc-6 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='debian-9';
-      travis/postsubmit.sh DefaultRelease BuildLib
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+      travis/postsubmit.sh DefaultRelease TestAll
    before_cache:
      docker cp storm:/storm/. .
-  - stage: Build all
+  # debian-9
+  - stage: Test all
    os: linux
    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+    env: BUILD=DefaultDebug COMPILER=gcc-6 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';
-      travis/postsubmit.sh DefaultRelease BuildAll
+      travis/postsubmit.sh DefaultDebug TestAll
    before_cache:
      docker cp storm:/storm/. .
  - stage: Test all
@ -196,35 +265,7 @@ jobs:
      travis/postsubmit.sh DefaultRelease TestAll
    before_cache:
      docker cp storm:/storm/. .
-
-  ###
  # osx
-  ###
-
-  - stage: Build dependencies
-    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++';
-      travis/install_osx.sh
-    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++';
-      travis/install_osx.sh
-    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++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultDebug BuildAll
  - stage: Test all
    os: osx
    compiler: clang
@ -233,30 +274,6 @@ jobs:
      travis/install_osx.sh
    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++';
-      travis/install_osx.sh
-    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++';
-      travis/install_osx.sh
-    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++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultRelease BuildAll
  - stage: Test all
    os: osx
    compiler: clang
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@ -60,17 +60,18 @@ if __name__ == "__main__":
    s += "  include:\n"

    # Generate all configurations
-    # Linux via Docker
-    for config in configs_linux:
-        linux = config[0]
-        compiler = "{}{}".format(config[1], config[2])
+    for stage in stages:
        s += "\n"
        s += "  ###\n"
-        s += "  # {}\n".format(linux)
+        s += "  # Stage: {}\n".format(stage)
        s += "  ###\n"
        s += "\n"
-        for build in build_types:
-            for stage in stages:
+        # Linux via Docker
+        for config in configs_linux:
+            linux = config[0]
+            compiler = "{}{}".format(config[1], config[2])
+            s += "  # {}\n".format(linux)
+            for build in build_types:
                s += "  - stage: {}\n".format(stage[0])
                s += "    os: linux\n"
                s += "    compiler: {}\n".format(config[1])
@ -82,17 +83,12 @@ if __name__ == "__main__":
                s += "    before_cache:\n"
                s += "      docker cp storm:/storm/. .\n"

-    # Mac OS X
-    for config in configs_mac:
-        osx = config[0]
-        compiler = "{}{}".format(config[1], config[2])
-        s += "\n"
-        s += "  ###\n"
-        s += "  # {}\n".format(osx)
-        s += "  ###\n"
-        s += "\n"
-        for build in build_types:
-            for stage in stages:
+        # Mac OS X
+        for config in configs_mac:
+            osx = config[0]
+            compiler = "{}{}".format(config[1], config[2])
+            s += "  # {}\n".format(osx)
+            for build in build_types:
                s += "  - stage: {}\n".format(stage[0])
                s += "    os: osx\n"
                s += "    compiler: {}\n".format(config[1])