diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | extras/scripts/travis_yml_generator.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 5f216d8..01bccd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -255,7 +255,7 @@ matrix: install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; travis_wait extras/scripts/travis_ci_install_osx.sh os: osx - osx_image: xcode9.3 + osx_image: xcode9.4 script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh ReleasePlainNoClangTidy - compiler: clang @@ -263,7 +263,7 @@ matrix: install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; travis_wait extras/scripts/travis_ci_install_osx.sh os: osx - osx_image: xcode9.3 + osx_image: xcode9.4 script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh DebugAsanUbsanNoClangTidy - compiler: clang @@ -271,7 +271,7 @@ matrix: install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; travis_wait extras/scripts/travis_ci_install_osx.sh os: osx - osx_image: xcode11.4 + osx_image: xcode11.3 script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh ReleasePlainNoClangTidy - compiler: clang @@ -279,7 +279,7 @@ matrix: install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; travis_wait extras/scripts/travis_ci_install_osx.sh os: osx - osx_image: xcode11.4 + osx_image: xcode11.3 script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh DebugAsanUbsanNoClangTidy - compiler: clang @@ -287,7 +287,7 @@ matrix: install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; travis_wait extras/scripts/travis_ci_install_osx.sh os: osx - osx_image: xcode11.4 + osx_image: xcode11.3 script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh DebugPlainNoClangTidy services: diff --git a/extras/scripts/travis_yml_generator.py b/extras/scripts/travis_yml_generator.py index 488f770..30147b3 100755 --- a/extras/scripts/travis_yml_generator.py +++ b/extras/scripts/travis_yml_generator.py @@ -185,8 +185,8 @@ add_osx_tests(compiler='clang-8.0', xcode_version='11.4', stl='libc++', smoke_te # Disabled due to https://bugs.llvm.org/show_bug.cgi?id=41625. use_precompiled_headers_in_tests=False) -add_osx_tests(compiler='clang-default', xcode_version='9.3', stl='libc++', clang_tidy=False) -add_osx_tests(compiler='clang-default', xcode_version='11.4', stl='libc++', clang_tidy=False, smoke_tests=['DebugPlain']) +add_osx_tests(compiler='clang-default', xcode_version='9.4', stl='libc++', clang_tidy=False) +add_osx_tests(compiler='clang-default', xcode_version='11.3', stl='libc++', clang_tidy=False, smoke_tests=['DebugPlain']) # ** Disabled combinations ** # |