diff options
| author | Aleks Kissinger <aleks0@gmail.com> | 2018-12-20 22:36:02 +0100 |
|---|---|---|
| committer | Aleks Kissinger <aleks0@gmail.com> | 2018-12-20 22:36:02 +0100 |
| commit | 52b50ae84813951e5cbc457153bd981e5a96bc2d (patch) | |
| tree | 98048d9605c3807ccdefaf76e47a4b9dbba772dd /.travis.yml | |
| parent | 3a981911858553daab4af26af7e46e5b62b0034b (diff) | |
...
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 1c814d1..45b5146 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,27 +18,19 @@ matrix: - FILE=tikzit-osx-mountain.dmg - QTVER=56 - DEPLOY_TIKZIT=1 - # - 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" != 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' + # - '[[ "$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 || "$QTVER" != 511 ]] || brew install qt5' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install poppler --with-qt' - '[[ "$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' + # - '[[ "$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' script: - qmake -v |