aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar IceN9ne2016-12-08 08:37:48 -0500
committerGravatar IceN9ne2016-12-08 08:37:48 -0500
commitd30031234136d158e896b9302d4e4cd366b7a3a1 (patch)
tree061fe6952c8cf7cdd10bc1a34e4d4c6b6a6cb3b4
parentoptionctlr: Remove hardcoded fixed pixel size and restrict resize (diff)
downloadKVIrc-d30031234136d158e896b9302d4e4cd366b7a3a1.tar.gz
KVIrc-d30031234136d158e896b9302d4e4cd366b7a3a1.tar.bz2
KVIrc-d30031234136d158e896b9302d4e4cd366b7a3a1.zip
Travis: workaround for travis-ci/travis-ci#6307
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index c10ec8320..cdc99f721 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sw_vers; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep cpu; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep mem; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get head; fi
- if [[ "$TRAVIS_REPO_SLUG" == "kvirc/KVIrc" && "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" == "master" ]]; then openssl aes-256-cbc -K $encrypted_da8de0aafbfc_key -iv $encrypted_da8de0aafbfc_iv -in .travis-github.ssh.enc -out ~/kvirc-github-key -d; fi
- export encrypted_da8de0aafbfc_key=no
- pwd