summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml48
1 files changed, 15 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml
index f11e2bf..056b543 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +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 update'
- - '[[ "$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