diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2016-10-20 14:07:21 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2016-10-20 14:07:21 +0200 |
| commit | 185869858b47dd28f044675e508b6498fbdb4e60 (patch) | |
| tree | ab052c1f5363b6d21e88b4a1fe322a8a01df3704 /.travis.yml | |
| parent | fcee0e74efdf30eae04fb4d49cc932db5554678a (diff) | |
Re-enabled node (appdmg) on travis OSX
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 17c82643..a3e71c37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,11 +23,11 @@ addons: branch_pattern: coverity_scan install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew unlink node; brew install node; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew unlink node; brew install node; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pandoc; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt57base qt57tools qt57svg; fi before_script: @@ -37,26 +37,26 @@ script: - qmake -Wall qtpass.pro - make -j$(nproc) - if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt QtPass.app; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg; fi -#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pro | cut -d " " -f 6); fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pro | cut -d " " -f 6); fi notifications: irc: channels: - chat.freenode.net#IJhack on_success: change on_failure: always -#deploy: -# provider: releases -# api_key: -# secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go= -# file: "qtpass-$VERSION.dmg" -# on: -# repo: IJHack/qtpass -# tags: true -# condition: $TRAVIS_OS_NAME = osx && $CC = clang -# skip_cleanup: true +deploy: + provider: releases + api_key: + secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go= + file: "qtpass-$VERSION.dmg" + on: + repo: IJHack/qtpass + tags: true + condition: $TRAVIS_OS_NAME = osx && $CC = clang + skip_cleanup: true |