mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
Merge #19276: ci: Move travis workarounds to .travis.yml
fa7166759789c1282609ff3ab2e80d4f70910a9f ci: Move travis workarounds to .travis.yml (MarcoFalke) Pull request description: It seems odd to have travis related workarounds in the general ci config files. Fix that oddity by moving the travis related workarounds to the travis yaml file. For unexplained reasons, this should also work around and thus close #19171 ACKs for top commit: hebasto: ACK fa7166759789c1282609ff3ab2e80d4f70910a9f, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: b4419d38e2b41f6e4d6e6b7658f1d972c40c390a49fe78808f8640d28efd84cc6668ce292d45b7c539e65b9e2ecbad10e796cb8f9329a0f1e7d0132ce962d226
This commit is contained in:
parent
d7ea4757df
commit
8342f75fc6
@ -81,7 +81,9 @@ before_install:
|
||||
install:
|
||||
- set -o errexit; source ./ci/test/04_install.sh
|
||||
before_script:
|
||||
- set -o errexit; source ./ci/test/05_before_script.sh
|
||||
# Temporary workaround for https://github.com/bitcoin/bitcoin/issues/16368
|
||||
- for i in {1..4}; do echo "$(sleep 500)" ; done &
|
||||
- set -o errexit; source ./ci/test/05_before_script.sh &> "/dev/null"
|
||||
script:
|
||||
- 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
|
||||
after_script:
|
||||
|
@ -24,7 +24,6 @@ export BOOST_TEST_LOG_LEVEL=test_suite
|
||||
|
||||
cd build-ci/dashcore-$BUILD_TARGET
|
||||
|
||||
bash -c "${CI_WAIT}" & # Print dots in case the unit tests take a long time to run
|
||||
if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then
|
||||
# Inside Docker, binfmt isn't working so we can't trust in make invoking windows binaries correctly
|
||||
wine ./src/test/test_dash.exe
|
||||
|
Loading…
Reference in New Issue
Block a user