From b56862fcf8b3dd93013b5079fddf97f9c8eebb12 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 22:26:39 +0100 Subject: [PATCH] Added python dependencies, replaced token and removed "x" option in shell scripts --- .travis.yml | 2 +- tools/build-macos-script.sh | 2 +- tools/macos.travis.yml | 5 ++++- tools/travis-script.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea404f1a..ec981e8e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ install: env: global: - - secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" + - secure: "Up4pCVf7nGErCqZQd+T1MZIPDQqpXqcA2nc3TL2CAKe8GaBjhseHL7nmk5gVxN3Pj4Hzun0QK8Nce91r+636C4iXR1MEGYZF+XVhDjd+yG5x4cyxBE/eAFzUYV1HEwB7jXPYFbYF4zGrQvrQc/eGYGxkZ4BXLnaMJLz19DwJo7U=" - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA=" diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index bcee4fca9..38bade926 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e ## New of branch to use TRAVIS_MAC_BRANCH=travis_mac_osx diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml index caa7c5612..ca724bd09 100644 --- a/tools/macos.travis.yml +++ b/tools/macos.travis.yml @@ -2,9 +2,12 @@ language: objective-c before_install: - brew update - brew install qt5 +- pip install pyjavaproperties +- pip install github3.py + env: global: - secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" + secure: "Up4pCVf7nGErCqZQd+T1MZIPDQqpXqcA2nc3TL2CAKe8GaBjhseHL7nmk5gVxN3Pj4Hzun0QK8Nce91r+636C4iXR1MEGYZF+XVhDjd+yG5x4cyxBE/eAFzUYV1HEwB7jXPYFbYF4zGrQvrQc/eGYGxkZ4BXLnaMJLz19DwJo7U=" script: - /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics - make -j 4 dmg diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 965483d77..01fa2ec0e 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e # let's dump some info to debug a bit echo ls = `ls`