diff options
| author | Gard Spreemann <gspreemann@gmail.com> | 2019-01-14 17:45:44 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspreemann@gmail.com> | 2019-01-14 17:45:44 +0100 |
| commit | 8074365997835ec3e93ee2aa1eadb3a794437066 (patch) | |
| tree | 6f87d32435c8214c77c9e8103ca4e1d697ae02d5 /.travis.yml | |
| parent | 5aef304fa112d4b11e401671900877d3c844e07d (diff) | |
| parent | d4b6e9839823e27af646a915436462254758e053 (diff) | |
Merge tag 'v2.1.2' into debian/sid
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 49 |
1 files changed, 16 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml index 52de1f4..056b543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,43 +1,26 @@ language: cpp - branches: only: - - master - + - master matrix: - include: + include: - os: osx compiler: clang env: - - FILE=tikzit-osx.dmg - - QTVER=511 - - DEPLOY_TIKZIT=1 - # - os: osx - # compiler: clang - # env: - # - FILE=tikzit-osx-mountain.dmg - # - QTVER=56 - # - DEPLOY_TIKZIT=1 - -before_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' - - - + - FILE=tikzit-osx.dmg + - QTVER=511 + - DEPLOY_TIKZIT=1 +before_install: install: - - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install qt5' - - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew link --force qt5' - - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install poppler --with-qt' - # - '[[ "$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' - +- brew update +- brew install qt5 +- brew link --force qt5 +- brew install poppler --with-qt script: - - qmake -v - - qmake -r - - make - - '[[ "$TRAVIS_OS_NAME" != osx ]] || (chmod +x deploy-osx.sh && ./deploy-osx.sh && mv tikzit.dmg $FILE)' - - '[[ "$DEPLOY_TIKZIT" != 1 ]] || curl --upload-file $FILE https://transfer.sh/$FILE' - +- qmake -v +- qmake -r +- make +- '(chmod +x deploy-osx.sh && ./deploy-osx.sh && mv tikzit.dmg $FILE)' +- python scripts/gh-push.py $FILE notifications: - email: false
\ No newline at end of file + email: false |