Skip to content

Commit fac229a

Browse files
author
MarcoFalke
committed
ci: Remove P_CI_DIR and --workdir
The --workdir setting to the docker run command is not needed. And P_CI_DIR/PWD is equal to BASE_ROOT_DIR, so just use that directly.
1 parent d23fda0 commit fac229a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

ci/test/04_install.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASa
2222
CI_CONTAINER_CAP="--cap-add SYS_PTRACE"
2323
fi
2424

25-
export P_CI_DIR="$PWD"
2625
export BINS_SCRATCH_DIR="${BASE_SCRATCH_DIR}/bins/"
2726

2827
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
@@ -53,7 +52,6 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
5352
--mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \
5453
--mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR" \
5554
--mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \
56-
-w $BASE_ROOT_DIR \
5755
--env-file /tmp/env \
5856
--name $CONTAINER_NAME \
5957
$CONTAINER_NAME)
@@ -64,7 +62,7 @@ else
6462
fi
6563

6664
CI_EXEC () {
67-
$CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:\$PATH && cd \"$P_CI_DIR\" && $*"
65+
$CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*"
6866
}
6967
export -f CI_EXEC
7068

0 commit comments

Comments
 (0)