diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-14 14:59:18 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-14 14:58:57 -0500 |
| commit | eeeee58bc9a52ad3bba348e9dd0a2b19f4ddaf66 (patch) | |
| tree | 81a51b7ffe467ead3673a6f5352f8c90f23e600b | |
| parent | 758c6d784da0f191c408fda97b3071dd7e1fe8a0 (diff) | |
travis: Combine --disable-bip70 into existing job
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 41532b9260..54c386dbb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,12 +85,12 @@ jobs: BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" - stage: test - name: '32-bit + dash [GOAL: install]' + name: '32-bit + dash [GOAL: install] [GUI: no BIP70]' env: >- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib python3-zmq" GOAL="install" - BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" + BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --disable-bip70 --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" CONFIG_SHELL="/bin/dash" - stage: test @@ -133,15 +133,6 @@ jobs: BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++" - stage: test - name: 'x86_64 Linux [GOAL: install] [no BIP70]' - env: >- - HOST=x86_64-unknown-linux-gnu - PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev" - NO_DEPENDS=1 - GOAL="install" - BITCOIN_CONFIG="--enable-zmq --disable-bip70 --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++" - - - stage: test name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]' env: >- HOST=x86_64-unknown-linux-gnu |