Skip to content

Commit ab91a0e

Browse files
author
MarcoFalke
committed
Merge #18798: ci: Fix default retry script usage
45615de ci: Fix default retry script usage (Hennadii Stepanov) Pull request description: On master (5352d14) `CI_RETRY_EXE=${CI_RETRY_EXE:retry}` works as a [Substring Expansion](https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html), and that is wrong. If `CI_RETRY_EXE` variable was unset initially, its new value becomes an empty string, but not "retry" as one could expect. Consequently, the `${CI_RETRY_EXE} ...` command does _not_ use `ci/retry/retry` script. This PR makes for `CI_RETRY_EXE` variable a usual parameter expansion, i.e., `${parameter:-word}`. Reference: bitcoin/bitcoin#18735 (comment) Top commit has no ACKs. Tree-SHA512: 108173f6b2677979b9ddf2f9b9df4a6c56f5efa81c36543a1816bb3b984e42984bf3c83fe413ea3a5ca1e2317c4efb02fea7180a6b44863af7cfe6202e9cf94d
2 parents e302830 + 45615de commit ab91a0e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ci/test/00_setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev
5959
export GOAL=${GOAL:-install}
6060
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets}
6161
export PATH=${BASE_ROOT_DIR}/ci/retry:$PATH
62-
export CI_RETRY_EXE=${CI_RETRY_EXE:retry}
62+
export CI_RETRY_EXE=${CI_RETRY_EXE:-"retry --"}

ci/test/04_install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ else
5858
bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*"
5959
}
6060
fi
61+
export -f DOCKER_EXEC
6162

6263
if [ -n "$DPKG_ADD_ARCH" ]; then
6364
DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"

0 commit comments

Comments
 (0)