Skip to content

Commit 4116a50

Browse files
author
MarcoFalke
committed
Merge #16959: ci: Set $HOST before setting fallback values
fadd76a ci: Remove TRAVIS env vars (MarcoFalke) fa449b8 ci: Set $HOST before setting fallback values (MarcoFalke) Pull request description: This shouldn't change anything, except that `$HOST` is now properly set in the `$BASE_OUTDIR`. (Previously it would always use `x86_64-unknown-linux-gnu` in the directory name and now it should use the correct host) The second commit removes travis environment variables in the `ci` system. Also, shouldn't change any behavior. ACKs for top commit: fanquake: ACK fadd76a - assuming Travis etc is happy. Tree-SHA512: aafd65bfc039523208b17d1ed886a3311995d984ec56c3de5f837b5a71d985061ee2da7af947f95a56ab101a0666fe7cd99434e196cd1b7ee9c460d156a185f6
2 parents 742cd77 + fadd76a commit 4116a50

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

ci/test/00_setup_env.sh

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@
66

77
export LC_ALL=C.UTF-8
88

9-
echo "Setting default values in env"
9+
echo "Setting specific values in env"
10+
if [ -n "${FILE_ENV}" ]; then
11+
set -o errexit;
12+
# shellcheck disable=SC1090
13+
source "${FILE_ENV}"
14+
fi
1015

1116
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
1217
export BASE_ROOT_DIR
1318

19+
echo "Fallback to default values in env (if not yet set)"
1420
# The number of parallel jobs to pass down to make and test_runner.py
1521
export MAKEJOBS=${MAKEJOBS:--j4}
1622
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
@@ -20,12 +26,16 @@ export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-true}
2026
export RUN_FUNCTIONAL_TESTS=${RUN_FUNCTIONAL_TESTS:-true}
2127
export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}
2228
export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:18.04}
23-
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1$TRAVIS_BUILD_ID}
29+
# Randomize test order.
30+
# See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html
31+
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}
2432
export CCACHE_SIZE=${CCACHE_SIZE:-100M}
2533
export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
2634
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
2735
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
28-
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-${TRAVIS_BUILD_DIR:-$BASE_ROOT_DIR}}
36+
# Folder where the build is done (depends and dist). Can not be changed and is equal to the root of the git repo
37+
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_ROOT_DIR}
38+
# Folder where the build is done (bin and lib). Can not be changed.
2939
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_BUILD_DIR/out/$HOST}
3040
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
3141
export WINEDEBUG=${WINEDEBUG:-fixme-all}
@@ -34,10 +44,3 @@ export GOAL=${GOAL:-install}
3444
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_BUILD_DIR}/qa-assets}
3545
export PATH=${BASE_ROOT_DIR}/ci/retry:$PATH
3646
export CI_RETRY_EXE=${CI_RETRY_EXE:retry}
37-
38-
echo "Setting specific values in env"
39-
if [ -n "${FILE_ENV}" ]; then
40-
set -o errexit;
41-
# shellcheck disable=SC1090
42-
source "${FILE_ENV}"
43-
fi

0 commit comments

Comments
 (0)