From 955b7330ba8081e16150c1970e31d71389d31d28 Mon Sep 17 00:00:00 2001
From: mocabe <hisa.mocabe@gmail.com>
Date: Fri, 31 Jan 2020 04:54:13 +0900
Subject: [PATCH] CI: Enable gcc5 with samples disabled

---
 .travis.yml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b91675..a34cb68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,21 @@ language: cpp
 
 matrix:
   include:
+    - os: linux
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - g++-5
+          - ninja-build
+          - xorg-dev 
+          - libglu1-mesa-dev
+      env: 
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+        - ADDITIONAL_BUILD_OPTIONS="-DSAMPLES_BUILD=OFF"
+      compiler: g++-5
+
     - os: linux
       addons:
         apt:
@@ -64,8 +79,6 @@ matrix:
             - ninja-build
             - xorg-dev 
             - libglu1-mesa-dev
-      env:
-        - MATRIX_EVAL=""
       compiler: clang++-3.6
 
     - os: linux
@@ -84,8 +97,6 @@ matrix:
             - ninja-build
             - xorg-dev 
             - libglu1-mesa-dev
-      env:
-        - MATRIX_EVAL=""
       compiler: clang++-4.0
 
     - os: linux
@@ -104,8 +115,6 @@ matrix:
             - ninja-build
             - xorg-dev 
             - libglu1-mesa-dev
-      env:
-        - MATRIX_EVAL=""
       compiler: clang++-5.0
 
     - os: linux
@@ -124,8 +133,6 @@ matrix:
             - ninja-build
             - xorg-dev 
             - libglu1-mesa-dev
-      env:
-        - MATRIX_EVAL=""
       compiler: clang++-6.0
 
 before_install:
@@ -135,5 +142,11 @@ script:
   - mkdir build
   - cd build
   - cmake --version
-  - cmake -GNinja .. -DSAMPLES_BUILD=ON -DTESTS_BUILD=ON -DSAMPLES_BUILD_ONLY_DYNAMIC=ON -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DTESTS_BUILD_ONLY_DYNAMIC=ON -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-  - cmake --build .
\ No newline at end of file
+  - cmake -GNinja .. 
+    -DSAMPLES_BUILD=ON 
+    -DTESTS_BUILD=ON
+    -DSAMPLES_BUILD_ONLY_DYNAMIC=ON 
+    -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON 
+    -DTESTS_BUILD_ONLY_DYNAMIC=ON -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
+    $ADDITIONAL_BUILD_OPTIONS
+  - cmake --build .