Skip to content

Commit 90b5fc9

Browse files
author
MarcoFalke
committed
Merge #19495: ci: Disable macOS functional tests on forked repos to avoid timeouts
60824b3 ci: Fix configure options for macOS builds (Hennadii Stepanov) 687939e ci: Drop Homebrew caching while using Homebrew addon on Travis (Hennadii Stepanov) 557d3f1 ci: Do not activate Travis ccache caching strategy (Hennadii Stepanov) 2d74742 ci: Disable functional tests on forked repos to avoid timeouts for macOS (Hennadii Stepanov) Pull request description: See: bitcoin-core#5 (comment) Additionally, this PR: - updates macOS image to the recent 10.15.5 version - drops Homebrew caching as the Travis Homebrew addon have been used since #18438 My forked repo build: https://travis-ci.org/github/hebasto/bitcoin/jobs/707200431 Top commit has no ACKs. Tree-SHA512: 398e935f965a04babeb10e7b26d2341562f21a1ef671c2e7cc97c9ec79d5c31643f81ca18561ab7714b5c52e19df2e4bffe4223eadbab984daa9418ffbf8c2a8
2 parents b93c424 + 60824b3 commit 90b5fc9

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

.travis.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ os: linux
1818
language: minimal
1919
arch: amd64
2020
cache:
21-
ccache: true
2221
directories:
2322
- $TRAVIS_BUILD_DIR/depends/built
2423
- $TRAVIS_BUILD_DIR/depends/sdk-sources
2524
- $TRAVIS_BUILD_DIR/ci/scratch/.ccache
2625
- $TRAVIS_BUILD_DIR/releases/$HOST
27-
before_cache:
28-
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
2926
stages:
3027
- lint
3128
- test
@@ -47,7 +44,7 @@ script:
4744
- if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi # Likely the depends build took very long
4845
- if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # continue on repos with extended build time (90 minutes)
4946
- if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
50-
- if [ $SECONDS -gt 2000 ]; then export CONTINUE=0; fi # Likely the build took very long; The tests take about 1000s, so we should abort if we have less than 50*60-1000=2000s left
47+
- if [[ $SECONDS -gt 50*60-$EXPECTED_TESTS_DURATION_IN_SECONDS ]]; then export CONTINUE=0; fi
5148
- if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # continue on repos with extended build time (90 minutes)
5249
- if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
5350
after_script:
@@ -136,22 +133,12 @@ jobs:
136133
# Xcode 11.3.1, macOS 10.14, SDK 10.15
137134
# https://docs.travis-ci.com/user/reference/osx/#macos-version
138135
osx_image: xcode11.3
139-
cache:
140-
directories:
141-
- $TRAVIS_BUILD_DIR/ci/scratch/.ccache
142-
- $TRAVIS_BUILD_DIR/releases/$HOST
143-
- $HOME/Library/Caches/Homebrew
144-
- /usr/local/Homebrew
145136
addons:
146137
homebrew:
147138
packages:
148-
- libtool
149139
- berkeley-db4
150-
- boost
151140
- miniupnpc
152-
- qt
153141
- qrencode
154-
- python3
155142
- ccache
156143
- zeromq
157144
env: >-

ci/test/00_setup_env.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch}
3131
export HOST=${HOST:-$("$BASE_ROOT_DIR/depends/config.guess")}
3232
# Whether to prefer BusyBox over GNU utilities
3333
export USE_BUSY_BOX=${USE_BUSY_BOX:-false}
34+
3435
export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-true}
3536
export RUN_FUNCTIONAL_TESTS=${RUN_FUNCTIONAL_TESTS:-true}
3637
export RUN_SECURITY_TESTS=${RUN_SECURITY_TESTS:-false}
3738
export TEST_RUNNER_ENV=${TEST_RUNNER_ENV:-}
3839
export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}
40+
export EXPECTED_TESTS_DURATION_IN_SECONDS=${EXPECTED_TESTS_DURATION_IN_SECONDS:-1000}
41+
3942
export CONTAINER_NAME=${CONTAINER_NAME:-ci_unnamed}
4043
export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:18.04}
4144
# Randomize test order.

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ export XCODE_BUILD_ID=11C505
1414
export RUN_UNIT_TESTS=false
1515
export RUN_FUNCTIONAL_TESTS=false
1616
export GOAL="deploy"
17-
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
17+
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror"

ci/test/00_setup_env_mac_host.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ export HOST=x86_64-apple-darwin16
1010
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to macos (bionic is used in the gitian build as well)
1111
export PIP_PACKAGES="zmq"
1212
export GOAL="install"
13-
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
14-
export RUN_SECURITY_TESTS="true"
15-
# Run without depends
13+
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror"
1614
export NO_DEPENDS=1
1715
export OSX_SDK=""
16+
export CCACHE_SIZE=300M
17+
18+
export RUN_SECURITY_TESTS="true"
19+
if [ "$TRAVIS_REPO_SLUG" != "bitcoin/bitcoin" ]; then
20+
export RUN_FUNCTIONAL_TESTS="false"
21+
export EXPECTED_TESTS_DURATION_IN_SECONDS=200
22+
fi

ci/test/04_install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1414
fi
1515

1616
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
17-
export PATH="/usr/local/opt/ccache/libexec:$PATH"
1817
${CI_RETRY_EXE} pip3 install $PIP_PACKAGES
1918
fi
2019

0 commit comments

Comments
 (0)