From 00ea50d964e465adcfb002e85cf1de7f74c7fcfc Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Wed, 25 Jun 2025 16:04:09 +0200
Subject: [PATCH] ci/android: download mesa artifacts in a more robust way

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35380>
---
 .gitlab-ci/android-runner.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index d10ed14e04b..3d3128c1ceb 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -60,11 +60,9 @@ get_vk_runtime_device_name
 get_vk_runtime_version
 
 # download Android Mesa from S3
-MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${S3_ANDROID_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
+curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
 mkdir /mesa-android
 tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-rm "${S3_ANDROID_ARTIFACT_NAME}.tar.zst" &
 
 INSTALL="/mesa-android/install"