From 5e745f653ff6be4ce38719a05f3057b3e266e68f Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Fri, 22 Aug 2025 20:12:33 -0300 Subject: [PATCH] ci/android: Use curl-with-retry in build scripts Let's standardize llvm android build script, by calling the `curl-with-retry` instead of a specific curl arg set. Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/container/build-android-x86_64-llvm.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-android-x86_64-llvm.sh b/.gitlab-ci/container/build-android-x86_64-llvm.sh index d59cae1b383..1ab42ed3f58 100755 --- a/.gitlab-ci/container/build-android-x86_64-llvm.sh +++ b/.gitlab-ci/container/build-android-x86_64-llvm.sh @@ -35,8 +35,7 @@ if ARTIFACTS_URL="$(find_s3_project_artifact "${ARTIFACTS_PATH}")"; then # Download prebuilt LLVM libraries for Android when they have not changed, # to save some time - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -o "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "${ARTIFACTS_URL}" + curl-with-retry -o "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "${ARTIFACTS_URL}" tar -C / --zstd -xf "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" rm "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" @@ -55,9 +54,8 @@ ANDROID_NDK="android-ndk-${ANDROID_NDK_VERSION}" ANDROID_NDK_ROOT="/${ANDROID_NDK}" if [ ! -d "$ANDROID_NDK_ROOT" ]; then - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -o "${ANDROID_NDK}.zip" \ - "https://dl.google.com/android/repository/${ANDROID_NDK}-linux.zip" + curl-with-retry -o "${ANDROID_NDK}.zip" \ + "https://dl.google.com/android/repository/${ANDROID_NDK}-linux.zip" unzip -d / "${ANDROID_NDK}.zip" "$ANDROID_NDK/source.properties" "$ANDROID_NDK/build/cmake/*" "$ANDROID_NDK/toolchains/llvm/*" rm "${ANDROID_NDK}.zip" fi