Skip to content

Commit fa908a4

Browse files
author
MarcoFalke
committed
ci: Set DEPENDS_DIR when setting BASE_ROOT_DIR
The depends dir can not be overwritten by a FILE_ENV file. Also, a FILE_ENV file might depend on the DEPENDS_DIR value. Thus, set it before reading FILE_ENV. This commit does not change behavior, but is required for later commits. Can be reviewed with --color-moved=dimmed-zebra
1 parent 19e3e65 commit fa908a4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci/test/00_setup_env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ export LC_ALL=C.UTF-8
1111
# This is where the depends build is done.
1212
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
1313
export BASE_ROOT_DIR
14+
# The depends dir.
15+
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
16+
export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
1417

1518
echo "Setting specific values in env"
1619
if [ -n "${FILE_ENV}" ]; then
@@ -56,9 +59,6 @@ export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
5659
# The cache dir.
5760
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
5861
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
59-
# The depends dir.
60-
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
61-
export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
6262
# Folder where the build result is put (bin and lib).
6363
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST}
6464
# Folder where the build is done (dist and out-of-tree build).

0 commit comments

Comments
 (0)