From a7dae7fd70baaf6b05668d4c14ce99dc54044159 Mon Sep 17 00:00:00 2001
From: j-selby <jselby@jselby.net>
Date: Thu, 27 Jul 2017 14:29:33 +1000
Subject: Produce 7zip artifacts on Travis and Appveyor

---
 .travis-deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis-deps.sh')

diff --git a/.travis-deps.sh b/.travis-deps.sh
index 451886984..25a287c7f 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -36,5 +36,5 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
 
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update
-    brew install qt5 sdl2 dylibbundler
+    brew install qt5 sdl2 dylibbundler p7zip
 fi
-- 
cgit v1.2.3


From fa64309aace2b782029ef599d20e8e0f1dd72a83 Mon Sep 17 00:00:00 2001
From: James <jselby@jselby.net>
Date: Fri, 4 Aug 2017 20:11:47 +1000
Subject: Travis: Use Docker to build for Linux

---
 .travis-deps.sh | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

(limited to '.travis-deps.sh')

diff --git a/.travis-deps.sh b/.travis-deps.sh
index 25a287c7f..0cee68041 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -5,35 +5,7 @@ set -x
 
 #if OS is linux or is not set
 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-6
-    export CXX=g++-6
-    mkdir -p $HOME/.local
-
-    if [ ! -e $HOME/.local/bin/cmake ]; then
-        echo "CMake not found in the cache, get and extract it..."
-        curl -L http://www.cmake.org/files/v3.6/cmake-3.6.3-Linux-x86_64.tar.gz \
-            | tar -xz -C $HOME/.local --strip-components=1
-    else
-        echo "Using cached CMake"
-    fi
-
-    if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
-        echo "SDL2 not found in cache, get and build it..."
-        wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz
-        cd SDL2-2.0.5
-        ./configure --prefix=$HOME/.local
-        make -j4 && make install
-    else
-        echo "Using cached SDL2"
-    fi
-
-    export DEBIAN_FRONTEND=noninteractive
-    # Amazing placebo security
-    curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo -E apt-key add -
-    sudo -E add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main"
-    sudo -E apt-get -yq update
-    sudo -E apt-get -yq install clang-format-3.9
-
+    docker pull ubuntu:16.04
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update
     brew install qt5 sdl2 dylibbundler p7zip
-- 
cgit v1.2.3


From 15a2388a33b1306dcaf16b62432c7a13b40ca2a3 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Fri, 6 Oct 2017 20:58:48 +0100
Subject: travis: Split build scripts for different platforms

This commit also separates clang-format from the linux build, closing #2702.
---
 .travis-deps.sh | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100755 .travis-deps.sh

(limited to '.travis-deps.sh')

diff --git a/.travis-deps.sh b/.travis-deps.sh
deleted file mode 100755
index 0cee68041..000000000
--- a/.travis-deps.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-#if OS is linux or is not set
-if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    docker pull ubuntu:16.04
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    brew update
-    brew install qt5 sdl2 dylibbundler p7zip
-fi
-- 
cgit v1.2.3