Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved mac travis file outside of script and update oauth token

Browse Source
This commit is contained in:
xawotihs
2014-12-07 17:26:32 +01:00
parent 6a37425a38
commit dbe1c6e2ae
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -28,7 +28,7 @@ install:
env: env:
global: global:
secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8=" secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM="
script: "tools/travis-script.sh" script: "tools/travis-script.sh"
tools/build-macos-script.sh
+1 -16
View File
@@ -3,21 +3,6 @@
## New of branch to use ## New of branch to use
TRAVIS_MAC_BRANCH=travis_mac_osx 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 ## Only cross-compile on Mac the master branch
test "$TRAVIS_BRANCH" != "master" && exit 0 test "$TRAVIS_BRANCH" != "master" && exit 0
@@ -38,7 +23,7 @@ fi
git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH" git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH"
## Write a new Travis-CI configuration file ## 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 add .travis.yml
git rm appveyor.yml git rm appveyor.yml
git commit -m "Auto-Updated Travis-CI configuration for Mac" git commit -m "Auto-Updated Travis-CI configuration for Mac"
tools/macos.travis.yml
+12
View File
@@ -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