Skip to content

Commit 5bb64ac

Browse files
committed
Merge #21243: ci: Avoid invoking curl on the host
fa330d8 ci: Avoid invoking curl on the host (MarcoFalke) Pull request description: The only requirement for the ci system are the programs `docker.io` and `bash`. However, the mac cross build invokes `curl` on the host. Fix that. Before: ``` $ FILE_ENV="./ci/test/00_setup_env_mac.sh" ./ci/test_run_all.sh ... ./ci/test/05_before_script.sh: line 22: curl: command not found ``` After: ``` ... (command passes) ACKs for top commit: promag: ACK fa330d8. Tree-SHA512: 49120fd671a48a6599dd6c34f6d3502a6e9f84b4476061cab06f55cba374d8188f53b9b41363e90f5fafb0074767b581f30bd2545c0b6934580a7eccfa1ef5c4
2 parents 828bb77 + fa330d8 commit 5bb64ac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-li
1919
OSX_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${OSX_SDK_BASENAME}"
2020

2121
if [ -n "$XCODE_VERSION" ] && [ ! -f "$OSX_SDK_PATH" ]; then
22-
curl --location --fail "${SDK_URL}/${OSX_SDK_BASENAME}" -o "$OSX_SDK_PATH"
22+
DOCKER_EXEC curl --location --fail "${SDK_URL}/${OSX_SDK_BASENAME}" -o "$OSX_SDK_PATH"
2323
fi
2424

2525
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then

0 commit comments

Comments
 (0)