From 172945434c50bb98e7d8b2f63d469a105dc2ff86 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 2 Aug 2019 20:46:27 -0700
Subject: [PATCH] Build the full DMG on Travis CI

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

diff --git a/.travis.yml b/.travis.yml
index 29324b99..8acd61be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,15 @@ language: cpp
 git:
   depth: 1
 
-env:
-  - NJOBS=2
-
 matrix:
   include:
     - os: osx
+      osx_image: xcode10.2
       compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - qt
     - os: linux
       sudo: required
       dist: xenial
@@ -35,10 +37,10 @@ matrix:
             - libvdpau-dev
 
 install:
-    - '[ "$TRAVIS_OS_NAME" != osx ] || brew install qt5'
-    - '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt5'
-    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_VER=2.0.9 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make -j$NJOBS && sudo make install && cd ..; fi
-    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_TTF_VER=2.0.15 && wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$SDL2_TTF_VER.tar.gz && tar -xvf SDL2_ttf-$SDL2_TTF_VER.tar.gz && cd SDL2_ttf-$SDL2_TTF_VER && ./configure && make -j$NJOBS && sudo make install && cd ..; fi
+    - '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt'
+    - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then nvm use node && npm install --global create-dmg; fi
+    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_VER=2.0.9 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi
+    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_TTF_VER=2.0.15 && wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$SDL2_TTF_VER.tar.gz && tar -xvf SDL2_ttf-$SDL2_TTF_VER.tar.gz && cd SDL2_ttf-$SDL2_TTF_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi
 
 before_script:
     - '[ "$TRAVIS_OS_NAME" != "linux" ] || source /opt/qt59/bin/qt59-env.sh'
@@ -48,6 +50,7 @@ before_script:
     - '[ "$TRAVIS_OS_NAME" != osx ]                          || export QMAKESPEC=macx-clang'
 
 script:
-    - qmake moonlight-qt.pro -spec $QMAKESPEC
-    - make -j$NJOBS debug
-    - make -j$NJOBS release
+    - '[ "$TRAVIS_OS_NAME" != "linux" ] || qmake moonlight-qt.pro -spec $QMAKESPEC'
+    - '[ "$TRAVIS_OS_NAME" != "linux" ] || make -j$(nproc) debug'
+    - '[ "$TRAVIS_OS_NAME" != "linux" ] || make -j$(nproc) release'
+    - '[ "$TRAVIS_OS_NAME" != "osx" ] || scripts/generate-dmg.sh Release'