diff options
| author | fanquake <fanquake@gmail.com> | 2023-10-20 10:48:57 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-10-20 11:23:04 +0100 |
| commit | fc1073bb450d67d5229123bd9bd9a0c1f4dc7cd3 (patch) | |
| tree | e802153558fa98e2c8b0ca97ae3d7f7f46e6b863 /ci | |
| parent | 77f0ceb7175dbd00b51e27838a7167804d67646f (diff) | |
| parent | 6889a807661cb570e1464ffdedb9ddb1ec970078 (diff) | |
Merge bitcoin/bitcoin#28643: ci: Add missing CI_RETRY_EXE before git clone
6889a807661cb570e1464ffdedb9ddb1ec970078 ci: Add missing CI_RETRY_EXE before git clone (MarcoFalke)
b705bade44973e61655d5f847f49d97fb5bb8393 ci: Export `IN_GETOPT_BIN` on macOS (Hennadii Stepanov)
1c2132ddd97dbf8fc908b0d1113bbb70e1a6a64e Revert "ci: Upgrading pip version in macos environment" (Hennadii Stepanov)
Pull request description:
This PR is a resurrection of https://github.com/bitcoin/bitcoin/pull/28623:
> This should fix [bitcoin/bitcoin/actions/runs/6457002476/job/17527598426#step:7:240](https://github.com/bitcoin/bitcoin/actions/runs/6457002476/job/17527598426#step:7:240):
>
> ```
> + git clone --depth=1 https://github.com/bitcoin-core/qa-assets /Users/runner/work/bitcoin/bitcoin/ci/scratch/qa-assets
> Cloning into '/Users/runner/work/bitcoin/bitcoin/ci/scratch/qa-assets'...
> error: RPC failed; curl 18 HTTP/2 stream 5 was reset
> error: 54975 bytes of body are still expected
> fetch-pack: unexpected disconnect while reading sideband packet
> fatal: early EOF
> fatal: fetch-pack: invalid index-pack output
> Error: Process completed with exit code 128.
> ```
ACKs for top commit:
maflcko:
lgtm ACK 6889a807661cb570e1464ffdedb9ddb1ec970078
Tree-SHA512: cd50102061a5c57fcf53ecbf552e7eae09995395e91651d00037e3f101c4906c0a994b2f6b1ccf984f2fc902ca59f0db66206ace56a2b6e2810dfa4167f3e115
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/lint/04_install.sh | 2 | ||||
| -rwxr-xr-x | ci/test/01_base_install.sh | 10 | ||||
| -rwxr-xr-x | ci/test/02_run_container.sh | 5 | ||||
| -rwxr-xr-x | ci/test/06_script_b.sh | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 8113500fb2..b160406392 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -18,7 +18,7 @@ ${CI_RETRY_EXE} apt-get install -y curl xz-utils git gpg PYTHON_PATH="/python_build" if [ ! -d "${PYTHON_PATH}/bin" ]; then ( - git clone https://github.com/pyenv/pyenv.git + ${CI_RETRY_EXE} git clone https://github.com/pyenv/pyenv.git cd pyenv/plugins/python-build || exit 1 ./install.sh ) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 68b701f3ca..a0b054ab40 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -31,14 +31,8 @@ elif [ "$CI_OS_NAME" != "macos" ]; then fi if [ -n "$PIP_PACKAGES" ]; then - if [ "$CI_OS_NAME" == "macos" ]; then - sudo -H pip3 install --upgrade pip - # shellcheck disable=SC2086 - IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES - else - # shellcheck disable=SC2086 - ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES - fi + # shellcheck disable=SC2086 + ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES fi if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index a74226b089..c8c54267e7 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -61,6 +61,11 @@ else mkdir -p "${PREVIOUS_RELEASES_DIR}" fi +if [ "$CI_OS_NAME" == "macos" ]; then + IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" + export IN_GETOPT_BIN +fi + CI_EXEC () { $CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*" } diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index 4d5f31b956..20464c3aea 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -56,7 +56,7 @@ index 65e31724bc..f61b471953 100644 if [ "$RUN_FUZZ_TESTS" = "true" ]; then export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/ if [ ! -d "$DIR_FUZZ_IN" ]; then - git clone --depth=1 https://github.com/bitcoin-core/qa-assets "${DIR_QA_ASSETS}" + ${CI_RETRY_EXE} git clone --depth=1 https://github.com/bitcoin-core/qa-assets "${DIR_QA_ASSETS}" fi ( cd "${DIR_QA_ASSETS}" |