Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-03 10:00:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set travis to only create snapcraft after gcc build

Browse Source
This commit is contained in:
Jonathan White 2016-11-25 10:12:45 -05:00
parent 0c40cdc990
commit 3cccfd97d2
No known key found for this signature in database
GPG Key ID: 506BDC439519BC13
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -7,9 +7,15 @@ os:
- linux - linux
# - osx # - osx
# Define clang compiler without any frills
compiler: compiler:
- gcc
- clang - clang
# Define gcc compile with deploy option (only for master/develop merges)
matrix:
include:
- compiler: gcc
env: DEPLOY=1
git: git:
depth: 3 depth: 3
@ -28,11 +34,13 @@ before_script:
script: script:
- cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUI_TESTS=ON $CMAKE_ARGS .. - 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 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" = "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 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi
# Generate snapcraft build when merging into master/develop branches
after_success: after_success:
- popd - 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'"