From 48f2987fe2cf7597458a75653ced1805468e91bb Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Fri, 10 Jun 2016 17:17:38 +0200 Subject: Travis deploy osx, hopefully --- .travis.yml | 57 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc993bbd..950668a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,37 +10,52 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt56; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt56; + fi addons: coverity_scan: project: - name: "IJHack/qtpass" - description: "Build submitted via Travis CI" + name: IJHack/qtpass + description: Build submitted via Travis CI notification_email: brouwer@annejan.com - build_command_prepend: "qmake; make clean" - build_command: "make" + build_command_prepend: qmake; make clean + build_command: make 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 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" = "linux" ]; then sudo apt-get -qq update; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt56base qt56tools qt56svg; fi +- 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 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" = "linux" ]; then sudo apt-get -qq update; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt56base qt56tools + qt56svg; fi before_script: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt56/bin/qt56-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt56/bin/qt56-env.sh; fi script: - - qmake -v - - qmake -Wall qtpass.pro - - make -j$(nproc) - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt QtPass.app; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown --to=rtf --output=README.rtf README.md; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg; fi +- qmake -v +- qmake -Wall qtpass.pro +- make -j$(nproc) +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt QtPass.app; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown --to=rtf + --output=README.rtf README.md; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION + qtpass.pro | cut -d " " -f 6).dmg; fi notifications: irc: channels: - chat.freenode.net#IJhack on_success: change -# on_failure: always + on_failure: always +deploy: + provider: releases + api_key: + secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go= + file: qtpass-*.dmg + on: + repo: IJHack/qtpass + tags: true + skip_cleanup: true -- cgit v1.2.3