Skip to content

Commit

Permalink
Set travis to only create snapcraft after gcc build
Browse files Browse the repository at this point in the history
  • Loading branch information
droidmonkey committed Nov 25, 2016
1 parent 0c40cdc commit 3cccfd9
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ os:
- linux
# - osx

# Define clang compiler without any frills
compiler:
- gcc
- clang

# Define gcc compile with deploy option (only for master/develop merges)
matrix:
include:
- compiler: gcc
env: DEPLOY=1

git:
depth: 3
Expand All @@ -28,11 +34,13 @@ before_script:

script:
- cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUI_TESTS=ON $CMAKE_ARGS ..
- make
- make -j2
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi

# Generate snapcraft build when merging into master/develop branches
after_success:
- popd
- "[[ $TRAVIS_BRANCH =~ (master|develop) ]] && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"
- "[[ $DEPLOY = 1 ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
&& docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"

0 comments on commit 3cccfd9

Please sign in to comment.