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.yml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index b92d7f236..8bad23208 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,32 @@ language: cpp
 matrix:
   include:
     - os: linux
+      env: NAME="linux build"
       sudo: required
       dist: trusty
+      services: docker
+      addons:
+        apt:
+          packages:
+            - p7zip-full
+      install: "./.travis/linux/deps.sh"
+      script: "./.travis/linux/build.sh"
+      after_success: "./.travis/linux/upload.sh"
     - os: osx
+      env: NAME="macos build"
       sudo: false
       osx_image: xcode7.3
-
-services:
-  - docker
-
-addons:
-  apt:
-    packages:
-      - clang-format-3.9
-      - p7zip-full
-
-install: "./.travis-deps.sh"
-script: "./.travis-build.sh"
-after_success: "./.travis-upload.sh"
+      install: "./.travis/macos/deps.sh"
+      script: "./.travis/macos/build.sh"
+      after_success: "./.travis/macos/upload.sh"
+    - os: linux
+      env: NAME="clang-format"
+      dist: trusty
+      addons:
+        apt:
+          packages:
+            - clang-format-3.9
+      script: "./.travis/clang-format/script.sh"
 
 deploy:
   provider: releases
-- 
cgit v1.2.3