From f32745bd9752f99480ad9b957222a5c2663048b2 Mon Sep 17 00:00:00 2001 From: xarkes Date: Mon, 23 Oct 2017 12:49:46 +0200 Subject: [PATCH] Fixing appveyor et travis builds --- .travis.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56f74ce4..58dea0f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,18 @@ language: cpp cache: ccache -os: - - linux - - osx - -env: - - TEST_COMMAND="qmake PREFIX=/tmp/.cutter_usr APPIMAGE=1 ../src && make -j4" - - TEST_COMMAND="cmake ../src && make -j4" +matrix: + include: + - os: linux + TEST_COMMAND="qmake PREFIX=/tmp/.cutter_usr APPIMAGE=1 ../src && make -j4" + DEPLOY=1 + - os: linux + TEST_COMMAND="cmake ../src && make -j4" + - os: osx + TEST_COMMAND="qmake ../src && make -j4" + DEPLOY=1 + - os: osx + TEST_COMMAND="cmake ../src && make -j4" sudo: required dist: trusty @@ -31,7 +36,6 @@ install: ; fi after_success: -# TODO: include radare2/www for the webserver # Unless we remove the webserver ;) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt cutter.app -dmg && export FILE_TO_UPLOAD="cutter.dmg" @@ -72,8 +76,9 @@ deploy: file: - "${FILE_TO_UPLOAD}" on: - repo: radareorg/cutter + tags: true + condition: $DEPLOY = 1 branches: - except: - - /^*-v[0-9]/ + only: + - master