File tree Expand file tree Collapse file tree 3 files changed +6
-21
lines changed Expand file tree Collapse file tree 3 files changed +6
-21
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,8 @@ elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (A
44
44
DOCKER_ADMIN=" --cap-add SYS_PTRACE"
45
45
fi
46
46
47
+ export P_CI_DIR=" $PWD "
48
+
47
49
if [ -z " $RUN_CI_ON_HOST " ]; then
48
50
echo " Creating $DOCKER_NAME_TAG container to run in"
49
51
${CI_RETRY_EXE} docker pull " $DOCKER_NAME_TAG "
@@ -57,12 +59,12 @@ if [ -z "$RUN_CI_ON_HOST" ]; then
57
59
$DOCKER_NAME_TAG )
58
60
59
61
DOCKER_EXEC () {
60
- docker exec $DOCKER_ID bash -c " export PATH=$BASE_SCRATCH_DIR /bins/:\$ PATH && cd $PWD && $* "
62
+ docker exec $DOCKER_ID bash -c " export PATH=$BASE_SCRATCH_DIR /bins/:\$ PATH && cd $P_CI_DIR && $* "
61
63
}
62
64
else
63
65
echo " Running on host system without docker wrapper"
64
66
DOCKER_EXEC () {
65
- bash -c " export PATH=$BASE_SCRATCH_DIR /bins/:\$ PATH && cd $PWD && $* "
67
+ bash -c " export PATH=$BASE_SCRATCH_DIR /bins/:\$ PATH && cd $P_CI_DIR && $* "
66
68
}
67
69
fi
68
70
Original file line number Diff line number Diff line change 19
19
fi
20
20
END_FOLD
21
21
22
- # Create folder on host and docker, so that `cd` works
23
- mkdir -p build
24
22
DOCKER_EXEC mkdir -p build
25
-
26
- # Temporarily disable errexit, because Travis macOS fails without error message
27
- set +o errexit
28
- cd build || (echo " could not enter build directory" ; exit 1)
29
- set -o errexit
23
+ export P_CI_DIR=" $P_CI_DIR /build"
30
24
31
25
BEGIN_FOLD configure
32
26
DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
@@ -38,9 +32,7 @@ mkdir -p "bitcoin-$HOST"
38
32
DOCKER_EXEC make distdir VERSION=$HOST
39
33
END_FOLD
40
34
41
- set +o errexit
42
- cd " bitcoin-$HOST " || (echo " could not enter distdir bitcoin-$HOST " ; exit 1)
43
- set -o errexit
35
+ export P_CI_DIR=" $P_CI_DIR /bitcoin-$HOST "
44
36
45
37
BEGIN_FOLD configure
46
38
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
@@ -52,7 +44,3 @@ trap 'DOCKER_EXEC "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR
52
44
BEGIN_FOLD build
53
45
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo " Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
54
46
END_FOLD
55
-
56
- set +o errexit
57
- cd ${BASE_ROOT_DIR} || (echo " could not enter base root dir $BASE_ROOT_DIR " ; exit 1)
58
- set -o errexit
Original file line number Diff line number Diff line change 6
6
7
7
export LC_ALL=C.UTF-8
8
8
9
- # Temporarily disable errexit, because Travis macOS fails without error message
10
- set +o errexit
11
- cd " build/bitcoin-$HOST " || (echo " could not enter distdir build/bitcoin-$HOST " ; exit 1)
12
- set -o errexit
13
-
14
9
if [ -n " $QEMU_USER_CMD " ]; then
15
10
BEGIN_FOLD wrap-qemu
16
11
echo " Prepare to run functional tests for HOST=$HOST "
You can’t perform that action at this time.
0 commit comments