Skip to content

Commit 2ca8962

Browse files
committed
travis: use slim generic image, and some fixups
Now that caches are distinct (travis-ci/travis-ci#4393), we can use the Travis minimal image. The minimal image should take less time to setup and lead to quicker builds. Also addressed while I'm in here: - No need to delete the broken google-chrome repo in the minimal image - Set the hostname to work-around an openjdk bug - Remove the non-functional apt-cache option - Remove useless message at completion - Install jre where the java tests are run
1 parent 37f9a1f commit 2ca8962

File tree

1 file changed

+26
-37
lines changed

1 file changed

+26
-37
lines changed

.travis.yml

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# errata:
2-
# - A travis bug causes caches to trample eachother when using the same
3-
# compiler key (which we don't use anyway). This is worked around for now by
4-
# replacing the "compilers" with a build name prefixed by the no-op ":"
5-
# command. See: https://github.com/travis-ci/travis-ci/issues/4393
6-
# - sudo/dist/group are set so as to get Blue Box VMs, necessary for [loopback]
7-
# IPv6 support
8-
91
sudo: required
102
dist: trusty
113

4+
#workaround for https://github.com/travis-ci/travis-ci/issues/5227
5+
addons:
6+
hostname: bitcoin-tester
7+
128
os: linux
13-
language: cpp
14-
compiler: gcc
9+
language: generic
10+
cache:
11+
directories:
12+
- depends/built
13+
- depends/sdk-sources
14+
- $HOME/.ccache
1515
env:
1616
global:
1717
- MAKEJOBS=-j3
@@ -25,35 +25,25 @@ env:
2525
- SDK_URL=https://bitcoincore.org/depends-sources/sdks
2626
- PYTHON_DEBUG=1
2727
- WINEDEBUG=fixme-all
28-
cache:
29-
apt: true
30-
directories:
31-
- depends/built
32-
- depends/sdk-sources
33-
- $HOME/.ccache
34-
matrix:
35-
fast_finish: true
36-
include:
37-
- compiler: ": ARM"
38-
env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
39-
- compiler: ": Win32"
40-
env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
41-
- compiler: ": 32-bit + dash"
42-
env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
43-
- compiler: ": Win64"
44-
env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
45-
- compiler: ": bitcoind"
46-
env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
47-
- compiler: ": No wallet"
48-
env: HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
49-
- compiler: ": Cross-Mac"
50-
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
51-
exclude:
52-
- compiler: gcc
28+
matrix:
29+
# ARM
30+
- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
31+
# Win32
32+
- HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc openjdk-7-jre-headless" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
33+
# 32-bit + dash
34+
- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq openjdk-7-jre-headless" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
35+
# Win64
36+
- HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc openjdk-7-jre-headless" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
37+
# bitcoind
38+
- HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq openjdk-7-jre-headless" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
39+
# No wallet
40+
- HOST=x86_64-unknown-linux-gnu PACKAGES=" openjdk-7-jre-headless python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
41+
# Cross-Mac
42+
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
43+
5344
before_install:
5445
- export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
5546
install:
56-
- if [ -n "$PACKAGES" ]; then sudo rm -f /etc/apt/sources.list.d/google-chrome.list; fi
5747
- if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
5848
- if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
5949
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
@@ -83,4 +73,3 @@ script:
8373
after_script:
8474
- echo $TRAVIS_COMMIT_RANGE
8575
- echo $TRAVIS_COMMIT_LOG
86-
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi

0 commit comments

Comments
 (0)