From 30dab0e9117288fe85356f5c7be4eb9bded48cf3 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Fri, 28 Aug 2015 22:01:45 +0100
Subject: [PATCH] Travis: try to simplify matrix config

[skip appveyor]
---
 .travis.yml | 49 ++++++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd359228..70d2d70c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,30 @@
 language: cpp
-os:
-    - linux
-    - osx
-compiler:
-    - gcc
-    - clang
 env:
-      matrix:
-          - BUILD_TYPE=normal
-          - BUILD_TYPE=asan
-          - BUILD_TYPE=tsan
-          - BUILD_TYPE=coverage
-      global:
-          - secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
+    global:
+        - secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
 matrix:
-    exclude:
-        - os: osx
-          env: BUILD_TYPE=asan
-        - os: osx
-          env: BUILD_TYPE=tsan
-        - os: osx
-          env: BUILD_TYPE=coverage
-        - compiler: gcc
-          env: BUILD_TYPE=asan
-        - compiler: gcc
-          env: BUILD_TYPE=tsan
-        - compiler: clang
-          env: BUILD_TYPE=coverage
-        - os: osx
-          compiler: gcc
     include:
+        - os: linux
+          compiler: gcc
+          env: BUILD_TYPE=coverage
+        - os: linux
+          compiler: gcc
+          env: BUILD_TYPE=normal
+        - os: linux
+          compiler: clang
+          env: BUILD_TYPE=normal
+        - os: linux
+          compiler: clang
+          env: BUILD_TYPE=asan
+        - os: linux
+          compiler: clang
+          env: BUILD_TYPE=tsan
+        - os: osx
+          compiler: clang
+          env: BUILD_TYPE=normal
         - os: osx
           compiler: clang
           env: BUILD_TYPE=normal USE_SYSTEM_OPENSSL=true
-
 before_install:
     - "echo os: [$TRAVIS_OS_NAME] build: [$BUILD_TYPE]"
     - if [[ "$BUILD_TYPE" == "normal" ]]; then export CFGFLAGS= MYCXXFLAGS= MYLDFLAGS=; fi