aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml63
-rwxr-xr-xextras/scripts/travis_yml_generator.py11
2 files changed, 67 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index e5cf995..c32b478 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,39 @@ matrix:
fast_finish: true
include:
- compiler: gcc
+ env: COMPILER=gcc-9 UBUNTU=19.04 TEST=ReleasePlain
+ install: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.04'; extras/scripts/postsubmit.sh
+ ReleasePlain
+ - compiler: gcc
+ env: COMPILER=gcc-9 UBUNTU=19.04 TEST=DebugPlain
+ install: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.04'; extras/scripts/postsubmit.sh
+ DebugPlain
+ - compiler: clang
+ env: COMPILER=clang-8 STL=libstdc++ UBUNTU=19.04 TEST=ReleasePlain
+ install: export OS=linux; export COMPILER='clang-8'; export STL='libstdc++'; export
+ UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='clang-8'; export STL='libstdc++'; export
+ UBUNTU='19.04'; extras/scripts/postsubmit.sh ReleasePlain
+ - compiler: clang
+ env: COMPILER=clang-8 STL=libstdc++ UBUNTU=19.04 TEST=DebugAsanUbsan
+ install: export OS=linux; export COMPILER='clang-8'; export STL='libstdc++'; export
+ UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='clang-8'; export STL='libstdc++'; export
+ UBUNTU='19.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
+ - compiler: clang
+ env: COMPILER=clang-8 STL=libstdc++ UBUNTU=19.04 TEST=DebugPlain
+ install: export OS=linux; export COMPILER='clang-8'; export STL='libstdc++'; export
+ UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='clang-8'; export STL='libstdc++'; export
+ UBUNTU='19.04'; extras/scripts/postsubmit.sh DebugPlain
+ - compiler: gcc
env: COMPILER=gcc-8 UBUNTU=18.10 TEST=ReleasePlain
install: export OS=linux; export COMPILER='gcc-8'; export UBUNTU='18.10'; extras/scripts/travis_ci_install_linux.sh
os: linux
@@ -43,6 +76,12 @@ matrix:
script: export OS=linux; export COMPILER='clang-7.0'; export STL='libstdc++';
export UBUNTU='18.10'; extras/scripts/postsubmit.sh DebugPlain
- compiler: gcc
+ env: COMPILER=bazel UBUNTU=18.04
+ install: export OS=linux; export COMPILER='bazel'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='bazel'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh
+ DebugPlain
+ - compiler: gcc
env: COMPILER=bazel UBUNTU=16.04
install: export OS=linux; export COMPILER='bazel'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
os: linux
@@ -66,10 +105,24 @@ matrix:
install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
extras/scripts/travis_ci_install_osx.sh
os: osx
- osx_image: xcode10
+ osx_image: xcode10.2
script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
DebugPlain
- compiler: clang
+ env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=19.04 TEST=ReleasePlain
+ install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
+ export UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
+ export UBUNTU='19.04'; extras/scripts/postsubmit.sh ReleasePlain
+ - compiler: clang
+ env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=19.04 TEST=DebugAsanUbsan
+ install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
+ export UBUNTU='19.04'; extras/scripts/travis_ci_install_linux.sh
+ os: linux
+ script: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
+ export UBUNTU='19.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
+ - compiler: clang
env: COMPILER=clang-4.0 STL=libstdc++ UBUNTU=18.10 TEST=ReleasePlain
install: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
export UBUNTU='18.10'; extras/scripts/travis_ci_install_linux.sh
@@ -204,7 +257,7 @@ matrix:
install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
extras/scripts/travis_ci_install_osx.sh
os: osx
- osx_image: xcode8.2
+ osx_image: xcode8.3
script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
ReleasePlain
- compiler: clang
@@ -212,7 +265,7 @@ matrix:
install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
extras/scripts/travis_ci_install_osx.sh
os: osx
- osx_image: xcode8.2
+ osx_image: xcode8.3
script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
DebugAsan
- compiler: clang
@@ -236,7 +289,7 @@ matrix:
install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
extras/scripts/travis_ci_install_osx.sh
os: osx
- osx_image: xcode10
+ osx_image: xcode10.2
script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
ReleasePlain
- compiler: clang
@@ -244,7 +297,7 @@ matrix:
install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
extras/scripts/travis_ci_install_osx.sh
os: osx
- osx_image: xcode10
+ osx_image: xcode10.2
script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
DebugAsanUbsan
services:
diff --git a/extras/scripts/travis_yml_generator.py b/extras/scripts/travis_yml_generator.py
index 57003ee..6120c88 100755
--- a/extras/scripts/travis_yml_generator.py
+++ b/extras/scripts/travis_yml_generator.py
@@ -144,12 +144,19 @@ def add_bazel_tests(ubuntu_version, smoke_tests=[]):
# TODO: re-enable ASan/UBSan once they work in Travis CI. ATM (as of 18 November 2017) they fail due to https://github.com/google/sanitizers/issues/837
+add_ubuntu_tests(ubuntu_version='19.04', compiler='gcc-9', asan=False, ubsan=False,
+ smoke_tests=['DebugPlain', 'ReleasePlain'])
+add_ubuntu_tests(ubuntu_version='19.04', compiler='clang-6.0', stl='libstdc++')
+add_ubuntu_tests(ubuntu_version='19.04', compiler='clang-8', stl='libstdc++',
+ smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain'])
+
add_ubuntu_tests(ubuntu_version='18.10', compiler='gcc-8', asan=False, ubsan=False,
smoke_tests=['DebugPlain', 'ReleasePlain'])
add_ubuntu_tests(ubuntu_version='18.10', compiler='clang-4.0', stl='libstdc++')
add_ubuntu_tests(ubuntu_version='18.10', compiler='clang-7.0', stl='libstdc++',
smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain'])
+add_bazel_tests(ubuntu_version='18.04', smoke_tests=['DebugPlain'])
add_bazel_tests(ubuntu_version='16.04', smoke_tests=['DebugPlain'])
# ASan/UBSan are disabled for all these, the analysis on later versions is better anyway.
@@ -172,10 +179,10 @@ add_osx_tests(compiler='clang-4.0', xcode_version='8', stl='libc++', smoke_tests
# UBSan is disabled because AppleClang does not support -fsanitize=undefined.
add_osx_tests(compiler='clang-default', xcode_version='7.3', stl='libc++', ubsan=False)
# UBSan is disabled because AppleClang does not support -fsanitize=undefined.
-add_osx_tests(compiler='clang-default', xcode_version='8.2', stl='libc++', ubsan=False)
+add_osx_tests(compiler='clang-default', xcode_version='8.3', stl='libc++', ubsan=False)
add_osx_tests(compiler='clang-default', xcode_version='9.4', stl='libc++')
-add_osx_tests(compiler='clang-default', xcode_version='10', stl='libc++', smoke_tests=['DebugPlain'])
+add_osx_tests(compiler='clang-default', xcode_version='10.2', stl='libc++', smoke_tests=['DebugPlain'])
# ** Disabled combinations **
#