From 9e8598fb1ca359143600d6bb2e8b317126a86bcc Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@outlook.com>
Date: Sat, 16 May 2020 20:59:10 +0100
Subject: Upgrade to C++17 [CMake] (#4717)

* Make our CMake slightly less insane
---
 .travis.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 8b517c5f8..a2a518751 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,7 @@ cache: ccache
 os: linux
 dist: bionic
 
-# CMake version out of date: update
-# TODO: add ARM64, PPC, SPARC builds when we find CMake for them
-addons:
-  snaps:
-  - name: cmake
-    confinement: classic
-    channel: latest
+# TODO: add ARM64, PPC, IBM builds when we find CMake for them
 
 jobs:
   include:
@@ -22,7 +16,7 @@ jobs:
       before_install:
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
       env: &Release
-        - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE
+        - TRAVIS_CUBERITE_BUILD_TYPE=Release
 
     - name: "AppleClang - Debug"
       os: osx
@@ -30,12 +24,14 @@ jobs:
       before_install:
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
       env: &Debug
-        - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG
+        - TRAVIS_CUBERITE_BUILD_TYPE=Debug
 
     - name: "Clang 7.0 - Release"
       compiler: clang
       before_install: &use-cmake
-        - export PATH=/snap/bin/:${PATH}
+        - wget --output-document=${HOME}/CMake http://cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.tar.gz
+        - tar --extract --one-top-level=${HOME}/SeeMake --strip-components 1 --file ${HOME}/CMake
+        - export PATH=${HOME}/SeeMake/bin/:${PATH}
       env: *Release
 
     - name: "Clang 7.0 - Debug"
@@ -43,9 +39,15 @@ jobs:
       before_install: *use-cmake
       env: *Debug
 
-    - name: "GCC 7.4 - Release, CMake 3.12"
+    - name: "GCC 7.4 - Release, CMake 3.12, No Unity"
       compiler: gcc
-      env: *Release
+      before_install:
+        - wget --output-document=${HOME}/CMake http://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.tar.gz
+        - tar --extract --one-top-level=${HOME}/SeeMake --strip-components 1 --file ${HOME}/CMake
+        - export PATH=${HOME}/SeeMake/bin/:${PATH}
+      env:
+        - TRAVIS_CUBERITE_BUILD_TYPE=Release
+        - TRAVIS_CUBERITE_UNITY_BUILDS=No
 
     - name: "GCC 7.4 - Debug"
       compiler: gcc
-- 
cgit v1.2.3