Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-25 23:39:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed snapcraft and unspecified unique gcc build

Browse Source
This commit is contained in:
Jonathan White 2017-01-14 22:41:22 -05:00
parent b7c658e8f8
commit a545dc9264
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@ -10,17 +10,12 @@ os:
# Define clang compiler without any frills # Define clang compiler without any frills
compiler: compiler:
- clang - clang
- gcc
env: env:
- CONFIG=Release - CONFIG=Release
- CONFIG=Debug - CONFIG=Debug
# Define gcc compile with deploy option (only for master/develop merges)
matrix:
include:
- compiler: gcc
env: DEPLOY=1
git: git:
depth: 3 depth: 3
@ -44,7 +39,7 @@ script:
- 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 # Generate snapcraft build when merging into master/develop branches
after_success: #after_success:
- popd # - popd
- "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \ # - "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
&& docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'" # && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"