aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-09-02 17:14:22 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-09-02 17:14:29 +0200
commitb319f0828ef7a944f2257799f7ce6d7ba7ab71ae (patch)
tree2eb0a0f7909f6320b27e7cee045c321c763b0b95
parent10c0e52b68c77d6cf1ba4aeb05618229bba3cd3d (diff)
parentbfadae33741ff3a58ed47f939080a3122bc2307d (diff)
downloadbitcoin-b319f0828ef7a944f2257799f7ce6d7ba7ab71ae.tar.xz
Merge pull request #6617
bfadae3 travis: for travis generating an extra build (Cory Fields)
-rw-r--r--.travis.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 1f6eb15c27..0537d69a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@
os: linux
language: cpp
+compiler: gcc
env:
global:
- MAKEJOBS=-j3
@@ -41,6 +42,8 @@ matrix:
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- compiler: ": Cross-Mac"
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake libcap-dev libz-dev libbz2-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
+ exclude:
+ - compiler: gcc
install:
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi