From c973c1cbd631c4a1ec01cfc79cc98709534b6f41 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 24 Aug 2016 12:01:01 +0200 Subject: [PATCH] POSIX shell. --- .travis-before-install.sh | 1 - .travis.yml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis-before-install.sh b/.travis-before-install.sh index 0d25eebfb..7eb1f8ab9 100755 --- a/.travis-before-install.sh +++ b/.travis-before-install.sh @@ -10,5 +10,4 @@ else sudo add-apt-repository ppa:beineri/opt-qt57-trusty -y sudo apt-get update sudo apt-get -y install qt57tools qt57base qt57webengine - bash /opt/qt57/bin/qt57-env.sh fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 10c446d7e..0ccaa7568 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp -osx_image: xcode8 +osx_image: xcode7.3 sudo: required dist: trusty @@ -19,6 +19,7 @@ before_install: ./.travis-before-install.sh install: true script: + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt57/bin/qt57-env.sh ; fi - mkdir rssguard-build && cd rssguard-build - qmake .. - make