diff options
| author | Aleks Kissinger <aleks0@gmail.com> | 2018-10-20 10:59:37 +0200 |
|---|---|---|
| committer | Aleks Kissinger <aleks0@gmail.com> | 2018-10-20 10:59:37 +0200 |
| commit | 56b21f3107fb36edeed15544a30238e4f57b977c (patch) | |
| tree | 85ce810e29413f1835bf2ce76cce2218e070bf98 /.travis.yml | |
| parent | 092c5c6b84b92a40e210ee7447fc7dbd3b492ca4 (diff) | |
added mac target for qt 5.6
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 91e7272..98be8d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,21 +9,33 @@ matrix: compiler: clang env: - FILE=tikzit-osx.dmg - - os: linux - dist: trusty + - QTVER=511 + - os: osx + compiler: clang env: - - FILE=tikzit-linux.tar.gz - - PPA=beineri/opt-qt-5.10.1-trusty + - FILE=tikzit-osx-mountain.dmg + - QTVER=56 + # - os: linux + # dist: trusty + # env: + # - FILE=tikzit-linux.tar.gz + # - PPA=beineri/opt-qt-5.10.1-trusty before_install: - - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy update' + # - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA' + # - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy update' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || curl https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci > macports-ci' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || source macports-ci install' + + install: - - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew install qt5' - - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew link --force qt5' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt510/bin/qt510-env.sh' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install qt5' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew link --force qt5' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || sudo port -N -k install qt56' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || export PATH=/opt/local/libexec/qt5/bin:$PATH' + # - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' + # - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt510/bin/qt510-env.sh' script: - qmake -v |