Skip to content

Commit 93e8bc2

Browse files
committed
Merge bitcoin/bitcoin#28296: ci: Add missing ${CI_RETRY_EXE} before curl
fa968ef ci: Add missing ${CI_RETRY_EXE} before curl (MarcoFalke) Pull request description: GitHub is frequently down and this is causing many intermittent issues. For example, from today: https://cirrus-ci.com/task/5740122163904512?logs=ci#L398 Try to fix it with a retry. ACKs for top commit: hebasto: ACK fa968ef Tree-SHA512: e9a1e51af37ec718ca776f20d8b5394680a9b059fb2a22505ccb6781472e4b072694e7d01661ede5a87ef1f58a9143e29d032b6a5d13d8be3b7d46eeff061563
2 parents 7bf078f + fa968ef commit 93e8bc2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ci/test/01_base_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ if [ -n "$XCODE_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OSX_SDK_BASENAME}" ]
8787
OSX_SDK_FILENAME="${OSX_SDK_BASENAME}.tar.gz"
8888
OSX_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${OSX_SDK_FILENAME}"
8989
if [ ! -f "$OSX_SDK_PATH" ]; then
90-
curl --location --fail "${SDK_URL}/${OSX_SDK_FILENAME}" -o "$OSX_SDK_PATH"
90+
${CI_RETRY_EXE} curl --location --fail "${SDK_URL}/${OSX_SDK_FILENAME}" -o "$OSX_SDK_PATH"
9191
fi
9292
tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
9393
fi
9494

9595
if [ -n "$ANDROID_HOME" ] && [ ! -d "$ANDROID_HOME" ]; then
9696
ANDROID_TOOLS_PATH=${DEPENDS_DIR}/sdk-sources/android-tools.zip
9797
if [ ! -f "$ANDROID_TOOLS_PATH" ]; then
98-
curl --location --fail "${ANDROID_TOOLS_URL}" -o "$ANDROID_TOOLS_PATH"
98+
${CI_RETRY_EXE} curl --location --fail "${ANDROID_TOOLS_URL}" -o "$ANDROID_TOOLS_PATH"
9999
fi
100100
mkdir -p "$ANDROID_HOME"
101101
unzip -o "$ANDROID_TOOLS_PATH" -d "$ANDROID_HOME"

ci/test/06_script_b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ elif [ "$RUN_UNIT_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]
3838
export DIR_UNIT_TEST_DATA=${DIR_QA_ASSETS}/unit_test_data/
3939
if [ ! -d "$DIR_UNIT_TEST_DATA" ]; then
4040
mkdir -p "$DIR_UNIT_TEST_DATA"
41-
curl --location --fail https://github.com/bitcoin-core/qa-assets/raw/main/unit_test_data/script_assets_test.json -o "${DIR_UNIT_TEST_DATA}/script_assets_test.json"
41+
${CI_RETRY_EXE} curl --location --fail https://github.com/bitcoin-core/qa-assets/raw/main/unit_test_data/script_assets_test.json -o "${DIR_UNIT_TEST_DATA}/script_assets_test.json"
4242
fi
4343
fi
4444

0 commit comments

Comments
 (0)