Update the Travis CI config to test against Ubuntu 20.04 instead of 19.10 and GCC 10 instead of 9.

2 files changed, 38 insertions, 38 deletions

diff --git a/.travis.yml b/.travis.yml
index d111db3..e55e08f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,38 +10,38 @@ matrix:
   fast_finish: true
   include:
   - compiler: gcc
-    env: COMPILER=gcc-9 UBUNTU=19.10 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-10 UBUNTU=20.04 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.10'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
       ReleasePlain
   - compiler: gcc
-    env: COMPILER=gcc-9 UBUNTU=19.10 TEST=DebugPlain
-    install: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-10 UBUNTU=20.04 TEST=DebugPlain
+    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-9'; export UBUNTU='19.10'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: clang
-    env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=19.10 TEST=ReleasePlain
+    env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=ReleasePlain
     install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      export UBUNTU='20.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.10'; extras/scripts/postsubmit.sh ReleasePlain
+      export UBUNTU='20.04'; extras/scripts/postsubmit.sh ReleasePlain
   - compiler: clang
-    env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=19.10 TEST=DebugAsanUbsan
+    env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=DebugAsanUbsan
     install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      export UBUNTU='20.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.10'; extras/scripts/postsubmit.sh DebugAsanUbsan
+      export UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
   - compiler: clang
-    env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=19.10 TEST=DebugPlain
+    env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=DebugPlain
     install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      export UBUNTU='20.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.10'; extras/scripts/postsubmit.sh DebugPlain
+      export UBUNTU='20.04'; 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
@@ -49,45 +49,45 @@ matrix:
     script: export OS=linux; export COMPILER='bazel'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: gcc
-    env: COMPILER=gcc-7 UBUNTU=19.10 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-7 UBUNTU=20.04 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='19.10'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
       ReleasePlain
   - compiler: gcc
-    env: COMPILER=gcc-7 UBUNTU=19.10 TEST=DebugPlain
-    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-7 UBUNTU=20.04 TEST=DebugPlain
+    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='19.10'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: clang
-    env: COMPILER=clang-10.0 STL=libstdc++ UBUNTU=19.10 TEST=ReleasePlain
+    env: COMPILER=clang-10.0 STL=libstdc++ UBUNTU=20.04 TEST=ReleasePlain
     install: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
     script: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/postsubmit.sh ReleasePlain
+      export UBUNTU='20.04'; extras/scripts/postsubmit.sh ReleasePlain
   - compiler: clang
-    env: COMPILER=clang-10.0 STL=libstdc++ UBUNTU=19.10 TEST=DebugAsanUbsan
+    env: COMPILER=clang-10.0 STL=libstdc++ UBUNTU=20.04 TEST=DebugAsanUbsan
     install: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
     script: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='19.10'; extras/scripts/postsubmit.sh DebugAsanUbsan
+      export UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
   - compiler: clang
-    env: COMPILER=clang-9.0 STL=libc++ UBUNTU=19.10 TEST=ReleasePlainNoPchNoClangTidy
+    env: COMPILER=clang-9.0 STL=libc++ UBUNTU=20.04 TEST=ReleasePlainNoPchNoClangTidy
     install: export OS=linux; export COMPILER='clang-9.0'; export STL='libc++'; export
-      UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
     script: export OS=linux; export COMPILER='clang-9.0'; export STL='libc++'; export
-      UBUNTU='19.10'; extras/scripts/postsubmit.sh ReleasePlainNoPchNoClangTidy
+      UBUNTU='20.04'; extras/scripts/postsubmit.sh ReleasePlainNoPchNoClangTidy
   - compiler: clang
-    env: COMPILER=clang-9.0 STL=libc++ UBUNTU=19.10 TEST=DebugAsanUbsanNoPchNoClangTidy
+    env: COMPILER=clang-9.0 STL=libc++ UBUNTU=20.04 TEST=DebugAsanUbsanNoPchNoClangTidy
     install: export OS=linux; export COMPILER='clang-9.0'; export STL='libc++'; export
-      UBUNTU='19.10'; extras/scripts/travis_ci_install_linux.sh
+      UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
     script: export OS=linux; export COMPILER='clang-9.0'; export STL='libc++'; export
-      UBUNTU='19.10'; extras/scripts/postsubmit.sh DebugAsanUbsanNoPchNoClangTidy
+      UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugAsanUbsanNoPchNoClangTidy
   - compiler: gcc
     env: COMPILER=gcc-5 UBUNTU=18.04 TEST=ReleasePlain
     install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh
diff --git a/extras/scripts/travis_yml_generator.py b/extras/scripts/travis_yml_generator.py
index 82c9388..8a67784 100755
--- a/extras/scripts/travis_yml_generator.py
+++ b/extras/scripts/travis_yml_generator.py
@@ -146,14 +146,14 @@ 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.10', compiler='gcc-7', asan=False, ubsan=False)
-add_ubuntu_tests(ubuntu_version='19.10', compiler='gcc-9', asan=False, ubsan=False,
+add_ubuntu_tests(ubuntu_version='20.04', compiler='gcc-7', asan=False, ubsan=False)
+add_ubuntu_tests(ubuntu_version='20.04', compiler='gcc-10', asan=False, ubsan=False,
                  smoke_tests=['DebugPlain', 'ReleasePlain'])
-add_ubuntu_tests(ubuntu_version='19.10', compiler='clang-6.0', stl='libstdc++',
+add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-6.0', stl='libstdc++',
                  smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain'])
-add_ubuntu_tests(ubuntu_version='19.10', compiler='clang-10.0', stl='libstdc++')
+add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-10.0', stl='libstdc++')
 # Using Clang 10 + libc++ doesn't work as of March 2020, it can't find STL headers.
-add_ubuntu_tests(ubuntu_version='19.10', compiler='clang-9.0', stl='libc++',
+add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-9.0', stl='libc++',
                  # Disabled due to https://bugs.llvm.org/show_bug.cgi?id=41625.
                  use_precompiled_headers_in_tests=False,
                  # As of March 2020, Clang tidy segfaults and can't find STL headers (not sure if these issues are related or independent).