Skip to content

Commit fa449b8

Browse files
author
MarcoFalke
committed
ci: Set $HOST before setting fallback values
1 parent c838f27 commit fa449b8

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

ci/test/00_setup_env.sh

Lines changed: 7 additions & 8 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, ...)
@@ -34,10 +40,3 @@ export GOAL=${GOAL:-install}
3440
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_BUILD_DIR}/qa-assets}
3541
export PATH=${BASE_ROOT_DIR}/ci/retry:$PATH
3642
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)