add clang 9 and 10 to travis

.travis.yml

@@ -54,14 +54,34 @@ jobs:
     # Initial test stage, if this fails everything else is canceled.
     - stage: Test
       # Clang is consistently the fastest to build, so use it for the initial test.
-      env: CLANG=clang++-3.8 TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
+    - env: CLANG=clang++-3.8 TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
       name: "Clang 3.8 Make build with curses and style check"
       compiler: clang
       addons: &clang38
         apt:
           packages: ["clang-3.8"]
           sources: [*apt_sources]
 
+    - env: CLANG=clang++-9
+      name: "Clang 9 Make build with Curses"
+      compiler: clang
+      addons: &clang9
+        apt:
+          packages: ["clang-9"]
+          sources: [*apt_sources, llvm-toolchain-xenial-9]
+
+    - env: CLANG=clang++-10 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~[starve] ~grenade_lethality"
+      name: "Clang 10 Make build with sanitizers enabled, but long-running tests disabled"
+      compiler: clang
+      dist: bionic
+      addons: &clang10
+        apt:
+          packages:
+            - clang-10
+          sources:
+            - sourceline: "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+
     # Then build different configurations and targets in parallel.
     - stage: "Main Compilers"
       env: COMPILER=g++ MODS=--mods=magiclysm LOCALIZE=0
@@ -72,23 +92,6 @@ jobs:
           packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"]
           sources: [*apt_sources]
 
-    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" TILES=1 SOUND=1 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency"
-      name: "GCC 8 Make build with Tiles, Sound and address sanitization"
-      dist: bionic
-      compiler: gcc
-      addons: &gcc8
-        apt:
-          packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
-          sources: *apt_sources
-
-    - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~[starve] ~grenade_lethality"
-      name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled"
-      compiler: clang
-      addons: &clang8
-        apt:
-          packages: ["clang-8"]
-          sources: [*apt_sources, llvm-toolchain-xenial-8]
-
     - stage: "Platforms and Tidy"
     # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
       env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" TILES=1 SOUND=1
@@ -198,6 +201,15 @@ jobs:
           packages: ["clang-7"]
           sources: [*apt_sources, llvm-toolchain-xenial-7]
 
+    - env: CLANG=clang++-8
+      name: "Clang 8 Make build with Curses"
+      if: type != pull_request
+      compiler: clang
+      addons: &clang8
+        apt:
+          packages: ["clang-8"]
+          sources: [*apt_sources, llvm-toolchain-xenial-8]
+
 before_script:
   - if [ -n "${CLANG}" ]; then COMPILER="$CLANG"; fi
   - ${COMPILER} --version