diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-07-11 21:57:34 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-07-24 16:10:47 +0200 |
| commit | fac229ab1f95ec77f18be8a783a2779dd781c684 (patch) | |
| tree | d036adc7d0b921264530d6d33a4139c988ce917e /ci | |
| parent | d23fda05842ba4539b225bbab01b94df0060f697 (diff) | |
| download | bitcoin-fac229ab1f95ec77f18be8a783a2779dd781c684.tar.xz | |
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.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/04_install.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 626461df03..2e739e7f11 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -22,7 +22,6 @@ if [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASa CI_CONTAINER_CAP="--cap-add SYS_PTRACE" fi -export P_CI_DIR="$PWD" export BINS_SCRATCH_DIR="${BASE_SCRATCH_DIR}/bins/" if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then @@ -53,7 +52,6 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then --mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \ --mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR" \ --mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \ - -w $BASE_ROOT_DIR \ --env-file /tmp/env \ --name $CONTAINER_NAME \ $CONTAINER_NAME) @@ -64,7 +62,7 @@ else fi CI_EXEC () { - $CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:\$PATH && cd \"$P_CI_DIR\" && $*" + $CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*" } export -f CI_EXEC |