Removed snapcraft and unspecified unique gcc build

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

View File

@ -10,17 +10,12 @@ os:
# Define clang compiler without any frills
compiler:
- clang
- gcc
env:
- CONFIG=Release
- CONFIG=Debug
# Define gcc compile with deploy option (only for master/develop merges)
matrix:
include:
- compiler: gcc
env: DEPLOY=1
git:
depth: 3
@ -44,7 +39,7 @@ script:
- 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
- "[[ $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'"
#after_success:
# - popd
# - "[[ $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'"