Only perform snapcraft build on develop or master, re-enabled clang

This commit is contained in:
Jonathan White 2016-11-23 22:28:08 -05:00
parent b2f3cc6903
commit 81392a71dd
No known key found for this signature in database
GPG Key ID: 506BDC439519BC13

View File

@ -1,6 +1,7 @@
language: cpp language: cpp
sudo: required sudo: required
dist: trusty dist: trusty
services: [docker]
os: os:
- linux - linux
@ -8,16 +9,11 @@ os:
compiler: compiler:
- gcc - gcc
# - clang - clang
git: git:
depth: 3 depth: 3
matrix:
include:
- env: BUILD=1
services: [docker]
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libmicrohttpd10 libmicrohttpd-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libmicrohttpd10 libmicrohttpd-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb; fi
@ -39,4 +35,4 @@ script:
after_success: after_success:
- popd - popd
- if [ ! -z "$BUILD" ]; then docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'; fi - "[[ $TRAVIS_BRANCH =~ (master|develop) ]] && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"