aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-10-10 08:27:58 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-10-10 08:30:09 +0200
commit11d486d23f6f718a36f9bb5c3c7476e33b43f136 (patch)
treec3b55dd32626467693bef8c39046ea6f2c5a9196
parentfe36e031cde8cd0e1cb446d761f229c088a0403f (diff)
parentcaecb42b3863634aa2c2301f85b1297e5044ecf4 (diff)
Merge pull request #5072
caecb42 Travis: Descriptive build names (Luke Dashjr)
-rw-r--r--.travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 89b2238655..94d1c15f80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
# errata:
# - A travis bug causes caches to trample eachother when using the same
# compiler key (which we don't use anyway). This is worked around for now by
-# using the phony compilers "true X". These can be removed when the travis
-# bug is fixed. See: https://github.com/travis-ci/casher/issues/6
+# replacing the "compilers" with a build name prefixed by the no-op ":"
+# command. See: https://github.com/travis-ci/casher/issues/6
os: linux
language: cpp
@@ -24,19 +24,19 @@ cache:
matrix:
fast_finish: true
include:
- - compiler: "true 1"
+ - compiler: ": ARM"
env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat"
- - compiler: "true 2"
+ - compiler: ": bitcoind"
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat CPPFLAGS=-DDEBUG_LOCKORDER"
- - compiler: "true 3"
+ - compiler: ": No wallet"
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat"
- - compiler: "true 4"
+ - compiler: ": 32-bit + dash"
env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" USE_SHELL="/bin/dash"
- - compiler: "true 5"
+ - compiler: ": Cross-Mac"
env: HOST=x86_64-apple-darwin11 PACKAGES="gcc-multilib g++-multilib cmake libcap-dev libz-dev libbz2-dev" OSX_SDK=10.7 GOAL="deploy"
- - compiler: "true 6"
+ - compiler: ": Win64"
env: HOST=x86_64-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev wine" RUN_TESTS=true GOAL="deploy"
- - compiler: "true 7"
+ - compiler: ": Win32"
env: HOST=i686-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine" RUN_TESTS=true GOAL="deploy"
install:
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi