From dbe1c6e2aee08d0f5f75a84aabd5fe4cbe7b3cf5 Mon Sep 17 00:00:00 2001
From: xawotihs <xawotihs@gmail.com>
Date: Sun, 7 Dec 2014 17:26:32 +0100
Subject: [PATCH] Moved mac travis file outside of script and update oauth
 token

---
 .travis.yml                 |  2 +-
 tools/build-macos-script.sh | 17 +----------------
 tools/macos.travis.yml      | 12 ++++++++++++
 3 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 tools/macos.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 73f3ec230..3daf0f480 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ install:
 
 env:
   global:
-    secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8="
+    secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM="
 
 script: "tools/travis-script.sh"
 
diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh
index c7cc35fee..4e4284eb2 100755
--- a/tools/build-macos-script.sh
+++ b/tools/build-macos-script.sh
@@ -3,21 +3,6 @@
 ## New of branch to use
 TRAVIS_MAC_BRANCH=travis_mac_osx
 
-## New Travis-CI configuration, adapted for Mac-OS
-NEW_TRAVIS_YML=\
-"language: objective-c
-before_install:
-- brew update
-- brew install qt5
-env:
-  global:
-    secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8="
-script:
-- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics
-- make -j 4 dmg
-after_success:
-- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH"
-
 ## Only cross-compile on Mac the master branch
 test "$TRAVIS_BRANCH" != "master" && exit 0
 
@@ -38,7 +23,7 @@ fi
 git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH"
 
 ## Write a new Travis-CI configuration file
-echo "$NEW_TRAVIS_YML" > .travis.yml
+cp tools/mac.travis.yml .travis.yml
 git add .travis.yml
 git rm appveyor.yml
 git commit -m "Auto-Updated Travis-CI configuration for Mac"
diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml
new file mode 100644
index 000000000..caa7c5612
--- /dev/null
+++ b/tools/macos.travis.yml
@@ -0,0 +1,12 @@
+language: objective-c
+before_install:
+- brew update
+- brew install qt5
+env:
+  global:
+    secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM="
+script:
+- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics
+- make -j 4 dmg
+after_success:
+- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH