Commit Graph

6 Commits

Author SHA1 Message Date
MarcoFalke
bd85d875f3 Merge #18798: ci: Fix default retry script usage
45615de26caa4c8ffeacc558143aaf6887cbb314 ci: Fix default retry script usage (Hennadii Stepanov)

Pull request description:

  On master (5352d14b3796d9e672a20ada8f7613a70fe448f4) `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: https://github.com/bitcoin/bitcoin/pull/18735#issuecomment-620095489

Top commit has no ACKs.

Tree-SHA512: 108173f6b2677979b9ddf2f9b9df4a6c56f5efa81c36543a1816bb3b984e42984bf3c83fe413ea3a5ca1e2317c4efb02fea7180a6b44863af7cfe6202e9cf94d
2022-04-03 18:08:59 -05:00
Kittywhiskers Van Gogh
f2b4607938 merge bitcoin#17011: Use busybox utils for one build 2022-02-12 19:24:32 +05:30
Kittywhiskers Van Gogh
9772512790 merge bitcoin#16959: Set $HOST before setting fallback values 2022-02-12 19:24:32 +05:30
Kittywhiskers Van Gogh
0f1a215abb merge bitcoin#16739: Pass down $MAKEJOBS to test_runner.py, other improvements 2022-02-12 19:24:32 +05:30
Kittywhiskers Van Gogh
9b1bd91f52 merge bitcoin#16623: Add environment files for all settings 2022-02-12 19:24:32 +05:30
Kittywhiskers Van Gogh
4d8d40b599 merge bitcoin#16582: Rework ci (Use travis only as fallback env) 2022-02-12 19:24:32 +05:30