File tree Expand file tree Collapse file tree 1 file changed +7
-8
lines changed Expand file tree Collapse file tree 1 file changed +7
-8
lines changed Original file line number Diff line number Diff line change 6
6
7
7
export LC_ALL=C.UTF-8
8
8
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
10
15
11
16
BASE_ROOT_DIR=$( cd " $( dirname " ${BASH_SOURCE[0]} " ) " /../../ > /dev/null 2>&1 && pwd )
12
17
export BASE_ROOT_DIR
13
18
19
+ echo " Fallback to default values in env (if not yet set)"
14
20
# The number of parallel jobs to pass down to make and test_runner.py
15
21
export MAKEJOBS=${MAKEJOBS:- -j4}
16
22
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
@@ -34,10 +40,3 @@ export GOAL=${GOAL:-install}
34
40
export DIR_QA_ASSETS=${DIR_QA_ASSETS:- ${BASE_BUILD_DIR} / qa-assets}
35
41
export PATH=${BASE_ROOT_DIR} /ci/retry:$PATH
36
42
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
You can’t perform that action at this time.
0 commit comments