Skip to content

Commit f4e4ea1

Browse files
author
MarcoFalke
committed
Merge #13515: travis: Enable qt for all jobs
3387bb0 travis: avoid timeout without saving caches, also enable all qt (Chun Kuan Lee) Pull request description: - If depends build take more than 20 mins, skip Bitcoin Core build to store depends caches and mark it fail. Then restart the job for Bitcoin Core build. - Enable Qt build for Windows and 32-bit Linux - Enable wallet for depends x86-64 Linux - Disable gui tests for Windows since they are not supported This would be helpful for upgrading Qt (#12971) and protobuf (#13513) Tree-SHA512: e943cbd848d90f9f70e29c94ed717f96ad2c2d27b433bafea762015756a2d2794fc28976c54aee087bf0f3726ac2c9140920272445a902038719b956e2160cf9
2 parents ae85c8d + 3387bb0 commit f4e4ea1

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

.travis.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ install:
3434
before_script:
3535
- set -o errexit; source .travis/test_05_before_script.sh
3636
script:
37-
- set -o errexit; source .travis/test_06_script.sh
37+
- if [ $SECONDS -gt 1200 ]; then set +o errexit; echo "Travis early exit to cache current state"; false; else set -o errexit; source .travis/test_06_script.sh; fi
3838
after_script:
3939
- echo $TRAVIS_COMMIT_RANGE
4040
- echo $TRAVIS_COMMIT_LOG
@@ -57,8 +57,7 @@ jobs:
5757
- stage: test
5858
env: >-
5959
HOST=arm-linux-gnueabihf
60-
PACKAGES="g++-arm-linux-gnueabihf"
61-
DEP_OPTS="NO_QT=1"
60+
PACKAGES="python3 g++-arm-linux-gnueabihf"
6261
RUN_UNIT_TESTS=false
6362
RUN_FUNCTIONAL_TESTS=false
6463
GOAL="install"
@@ -70,24 +69,21 @@ jobs:
7069
env: >-
7170
HOST=i686-w64-mingw32
7271
DPKG_ADD_ARCH="i386"
73-
DEP_OPTS="NO_QT=1"
7472
PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
75-
GOAL="install"
76-
BITCOIN_CONFIG="--enable-reduce-exports"
73+
GOAL="deploy"
74+
BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests"
7775
# Win64
7876
- stage: test
7977
env: >-
8078
HOST=x86_64-w64-mingw32
81-
DEP_OPTS="NO_QT=1"
8279
PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
83-
GOAL="install"
84-
BITCOIN_CONFIG="--enable-reduce-exports"
80+
GOAL="deploy"
81+
BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests"
8582
# 32-bit + dash
8683
- stage: test
8784
env: >-
8885
HOST=i686-pc-linux-gnu
8986
PACKAGES="g++-multilib python3-zmq"
90-
DEP_OPTS="NO_QT=1"
9187
GOAL="install"
9288
BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
9389
CONFIG_SHELL="/bin/dash"
@@ -133,5 +129,5 @@ jobs:
133129
OSX_SDK=10.11
134130
RUN_UNIT_TESTS=false
135131
RUN_FUNCTIONAL_TESTS=false
136-
GOAL="all deploy"
132+
GOAL="deploy"
137133
BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"

0 commit comments

Comments
 (0)