diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2016-06-10 17:51:30 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2016-06-10 17:51:30 +0200 |
| commit | 91e2dd06d2ce66745730f0b70a87d04db9380387 (patch) | |
| tree | 1e02a22e342a92b74108a6cb495f6dcc3a50a111 | |
| parent | d9589362f21ab7377c6157b04e4efca91573e02e (diff) | |
Fuck travis and it's linter
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 3f0f38ce..5d6748b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,7 @@ 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: @@ -24,15 +23,12 @@ addons: 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 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" = "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 script: @@ -40,10 +36,8 @@ script: - 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 +- 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: @@ -54,9 +48,10 @@ deploy: provider: releases api_key: secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go= - file: qtpass-*.dmg + file: qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg on: repo: IJHack/qtpass tags: true condition: $TRAVIS_OS_NAME = osx && $CC = clang skip_cleanup: true + |