From 4abd46483ab3cadda5cdb40dcd28e6f3b789d621 Mon Sep 17 00:00:00 2001
From: Christophe <christophe@lunarg.com>
Date: Mon, 10 May 2021 13:34:39 +0200
Subject: [PATCH] Fix Travis C.I. build

---
 .travis.yml | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 413501fe..18eff224 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -343,67 +343,47 @@ jobs:
         - CTEST_ENV="--parallel 4 --output-on-failure"
         - CMAKE_ENV="--parallel"
 
-    - name: "Clang 9 C++14 sse2 debug"
+    - name: "Clang C++14 sse2 debug"
       os: linux
       dist: focal
-      addons:
-        apt:
-          packages:
-            - clang-9
       env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
         - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
         - CTEST_ENV="--parallel 4 --output-on-failure"
         - CMAKE_ENV="--parallel"
 
-    - name: "Clang 9 C++17 sse2 debug"
+    - name: "Clang C++17 sse2 debug"
       os: linux
       dist: focal
-      addons:
-        apt:
-          packages:
-            - clang-9
       env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
         - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
         - CTEST_ENV="--parallel 4 --output-on-failure"
         - CMAKE_ENV="--parallel"
 
-    - name: "Clang 9 C++17 avx2 debug"
+    - name: "Clang C++17 avx2 debug"
       os: linux
       dist: focal
-      addons:
-        apt:
-          packages:
-            - clang-9
       env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
         - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON"
         - CTEST_ENV="--parallel 4 --output-on-failure"
         - CMAKE_ENV="--parallel"
 
-    - name: "Clang 9 C++17 pure debug"
+    - name: "Clang C++17 pure debug"
       os: linux
       dist: focal
-      addons:
-        apt:
-          packages:
-            - clang-9
       env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
         - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON"
         - CTEST_ENV="--parallel 4 --output-on-failure"
         - CMAKE_ENV="--parallel"
 
-    - name: "Clang 9 C++17 pure release"
+    - name: "Clang C++17 pure release"
       os: linux
       dist: focal
-      addons:
-        apt:
-          packages:
-            - clang-9
       env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
         - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON"
         - CTEST_ENV="--parallel 4 --output-on-failure"
         - CMAKE_ENV="--parallel"