Skip to content

Commit fa0656d

Browse files
author
MarcoFalke
committed
ci: Add DEPENDS_DIR variable, Add documentation for folders
1 parent faeeca8 commit fa0656d

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

ci/test/00_setup_env.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ if [ -n "${FILE_ENV}" ]; then
1313
source "${FILE_ENV}"
1414
fi
1515

16+
# The root dir.
17+
# The ci system copies this folder.
18+
# This is where the build is done (depends and dist).
1619
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
1720
export BASE_ROOT_DIR
1821

1922
echo "Fallback to default values in env (if not yet set)"
2023
# The number of parallel jobs to pass down to make and test_runner.py
2124
export MAKEJOBS=${MAKEJOBS:--j4}
2225
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
26+
# This folder only exists on the ci host.
2327
export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch/}
2428
# What host to compile for. See also ./depends/README.md
2529
# Tests that need cross-compilation export the appropriate HOST.
@@ -37,10 +41,13 @@ export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}
3741
export CCACHE_SIZE=${CCACHE_SIZE:-100M}
3842
export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
3943
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
44+
# The cache dir.
45+
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
4046
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
41-
# Folder where the build is done (depends and dist). Can not be changed and is equal to the root of the git repo
42-
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_ROOT_DIR}
43-
# Folder where the build is done (bin and lib). Can not be changed.
47+
# The depends dir.
48+
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
49+
export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
50+
# Folder where the build is done (bin and lib).
4451
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST}
4552
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
4653
export WINEDEBUG=${WINEDEBUG:-fixme-all}

ci/test/06_script_a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows
5454
END_FOLD
5555

5656
set +o errexit
57-
cd ${BASE_BUILD_DIR} || (echo "could not enter travis build dir $BASE_BUILD_DIR"; exit 1)
57+
cd ${BASE_BUILD_DIR} || (echo "could not enter base root dir $BASE_BUILD_DIR"; exit 1)
5858
set -o errexit

0 commit comments

Comments
 (0)