From d5a79ad5d7b5dd95df517db88de5aaa78d806c8d Mon Sep 17 00:00:00 2001
From: Gabi Melman <gmelman1@gmail.com>
Date: Sat, 21 Sep 2019 14:46:09 +0300
Subject: [PATCH] Update .travis.yml
---
.travis.yml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index adfba74d..dd26b617 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@
sudo: required
language: cpp
+# gcc 4.8
addons: &gcc48
apt:
packages:
@@ -12,6 +13,7 @@ addons: &gcc48
sources:
- ubuntu-toolchain-r-test
+# gcc 7.0
addons: &gcc7
apt:
packages:
@@ -19,6 +21,7 @@ addons: &gcc7
sources:
- ubuntu-toolchain-r-test
+# Clang 3.5
addons: &clang35
apt:
packages:
@@ -26,6 +29,15 @@ addons: &clang35
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5
+
+# Clang 7.0
+addons: &clang70
+ apt:
+ packages:
+ - clang-7
+ sources:
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-trusty-7
@@ -55,10 +67,12 @@ matrix:
# Test clang-7.0: C++11, Build=Debug, ASAN=On
- env: CLANG_VERSION=7.0 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off
- os: linux
+ os: linux
+ addons: *clang70
- env: CLANG_VERSION=7.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off
- os: linux
+ os: linux
+ addons: *clang70
# osx
- env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off
@@ -66,7 +80,6 @@ matrix:
-
before_script:
- if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
- if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi