From 837a5d6a2349a49dad9c0731cdf9b48a588dcb2e Mon Sep 17 00:00:00 2001
From: Frank Richter <frank.richter@gmail.com>
Date: Mon, 24 Jun 2019 10:10:19 +0200
Subject: [PATCH] Update travis config (#346)

* travis: Build with different, and a newer, gcc version

* travis: Also enable -Wall for mini-test

* travis: Avoid 'unused variable' in mini-test
---
 .travis.yml | 47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e038769..6e90273 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,36 @@
 # Build Configuration for Travis CI
 # https://travis-ci.org
 
-dist: precise
+dist: trusty
 sudo: false
 language: cpp
-compiler:
-  - gcc
+
+matrix:
+  include:
+    - os: linux
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - gcc-5
+          - g++-5
+      env: GCC_VERSION=5
+      compiler: gcc-5
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-8
+            - g++-8
+      env: GCC_VERSION=8
+      compiler: gcc-8
+
 install:
-- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    - llvm-toolchain-precise
-    - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
-    packages:
-    - gcc-5
-    - g++-5
-    - cmake
-    - cmake-data
+  - if [[ "${GCC_VERSION}" != "" ]]; then export CXX="g++-${GCC_VERSION}"; export CC="gcc-${GCC_VERSION}"; fi
 
 script:
   - cmake --version
@@ -26,11 +38,12 @@ script:
   - make -C /tmp/build
   - /tmp/build/VulkanHppGenerator
   - echo "#include \"vulkan.hpp\"" > /tmp/test.cpp
-  - echo "void myCreateInstance()" >> /tmp/test.cpp
+  - echo "int myCreateInstance()" >> /tmp/test.cpp
   - echo "{" >> /tmp/test.cpp
   - echo "    vk::Instance inst;" >> /tmp/test.cpp
   - echo "    auto const inst_info = vk::InstanceCreateInfo();" >> /tmp/test.cpp
   - echo "    vk::Result result = vk::createInstance(&inst_info, nullptr, &inst);" >> /tmp/test.cpp
+  - echo "    return static_cast<int> (result);" >> /tmp/test.cpp
   - echo "}" >> /tmp/test.cpp
   - cat /tmp/test.cpp
-  - ${CXX} -std=c++11 -Ivulkan -IVulkan-Headers/include -c /tmp/test.cpp
+  - ${CXX} -std=c++11 -Wall -Ivulkan -IVulkan-Headers/include -c /tmp/test.cpp