fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: use curl instead of wget in download-git-cache.sh

Browse source 
Note that this code is executed on the generic FDo gitlab runners, not
in our docker images. This change is merely to avoid the confusion that
lead to the code in the previous commit.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34684>
This commit is contained in:
Eric Engestrom 2025-04-22 16:49:51 +02:00 • committed by Marge Bot
parent 74809ce0e3
commit bf4fa82af9
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -81,9 +81,8 @@ variables:
MESA_TEMPLATES_COMMIT: &ci-templates-commit ea3f77641d91765396beba192b8defd3085fa343 MESA_TEMPLATES_COMMIT: &ci-templates-commit ea3f77641d91765396beba192b8defd3085fa343
CI_PRE_CLONE_SCRIPT: |- CI_PRE_CLONE_SCRIPT: |-
set -o xtrace set -o xtrace
wget -q -O download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh curl --silent --location --fail --retry-connrefused --retry 3 --retry-delay 10 \
bash download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | bash
rm download-git-cache.sh
set +o xtrace set +o xtrace
S3_JWT_FILE: /s3_jwt S3_JWT_FILE: /s3_jwt
S3_JWT_FILE_SCRIPT: |- S3_JWT_FILE_SCRIPT: |-

4
.gitlab-ci/download-git-cache.sh
View file

@ -16,8 +16,8 @@ fi
TMP_DIR=$(mktemp -d) TMP_DIR=$(mktemp -d)
echo "$(date +"%F %T") Downloading archived master..." echo "$(date +"%F %T") Downloading archived master..."
if ! /usr/bin/wget \ if ! curl --location --fail --retry-connrefused --retry 3 --retry-delay 10 \
-O "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \ --output "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \
"https://${S3_HOST}/${S3_GITCACHE_BUCKET}/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz"; "https://${S3_HOST}/${S3_GITCACHE_BUCKET}/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
then then
echo "Repository cache not available" echo "Repository cache not available"