update CI toolchain

pauloacmartinez · kris-jusiak · commit ea8a9248bbfe · 2020-02-22T10:36:33.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "libs/googletest"]
 	path = libs/googletest
-	url = https://github.com/google/googletest.git
+	url = ../../google/googletest
 [submodule "libs/json"]
 	path = libs/json
-	url = https://github.com/nlohmann/json.git
+	url = ../../nlohmann/json
 [submodule "libs/gherkin-cpp"]
 	path = libs/gherkin-cpp
-	url = https://github.com/c-libs/gherkin-cpp.git
+	url = ../../c-libs/gherkin-cpp
diff --git a/.travis.yml b/.travis.yml
@@ -14,54 +14,50 @@ matrix:
   include:
 
   - os: linux
-    env: CXX=clang++-3.7
-    addons: { apt: { packages: ["clang-3.7", "libstdc++-5-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.7"] } }
-
-  - os: linux
-    dist: precise
+    dist: xenial
     env: CXX=clang++-3.8
-    addons: { apt: { packages: ["clang-3.8", "libstdc++-6-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.8"] } }
+    addons: { apt: { packages: ["llvm-3.8-dev", "valgrind"] } }
 
   - os: linux
-    dist: precise
-    env:  CXX=clang++-3.9
-    addons: { apt: { packages: ["clang-3.9", "libstdc++-6-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.9"] } }
+    dist: bionic
+    env:  CXX=clang++-6
+    addons: { apt: { packages: ["llvm-6.0-dev", "valgrind"] } }
 
   - os: linux
-    dist: precise
-    env: CXX=clang++-4.0
-    addons: { apt: { packages: ["clang-4.0", "libstdc++-6-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-4.0"] } }
+    dist: bionic
+    env: CXX=clang++-9
+    addons: { apt: { packages: ["llvm-9-dev", "valgrind"] } }
 
   - os: linux
-    dist: precise
+    dist: xenial
     env: CXX=g++-5
-    addons: { apt: { packages: ["g++-5", "libstdc++-5-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
+    addons: { apt: { packages: ["g++-5", "valgrind"] } }
 
   - os: linux
-    dist: precise
-    env: CXX=g++-6
-    addons: { apt: { packages: ["g++-6", "libstdc++-6-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
+    dist: bionic
+    env: CXX=g++-7
+    addons: { apt: { packages: ["g++-7", "valgrind"] } }
 
   - os: linux
-    dist: trusty
-    env: CXX=g++-7
-    addons: { apt: { packages: ["g++-7", "libstdc++-7-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
+    dist: bionic
+    env: CXX=g++-7  VARIANT=coverage
+    addons: { apt: { packages: ["g++-7", "valgrind"] } }
 
   - os: linux
-    dist: trusty
-    env: CXX=g++-7 VARIANT=coverage
-    addons: { apt: { packages: ["g++-7", "libstdc++-7-dev", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
+    dist: bionic
+    env: CXX=g++-8
+    addons: { apt: { packages: ["g++-8", "valgrind"] } }
 
   - os: osx
-    osx_image: xcode7.3
+    osx_image: xcode9.4
     env: CXX=clang++
 
   - os: osx
-    osx_image: xcode8.3
+    osx_image: xcode10.3
     env: CXX=clang++
 
   - os: osx
-    osx_image: xcode9.1
+    osx_image: xcode11.3
     env: CXX=clang++
 
 script:
