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

ci/fluster: Use the structured tag as the Fluster vector version

Browse source 
The strucutered tag replaces the need to have a separate
FLUSTER_VECTORS_VERSION variable just to check if the vectors changed.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
This commit is contained in:
Valentine Burley 2025-05-01 12:36:43 +02:00
parent b01a091856
commit f6f7f9e7a2
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/conditional-build-image-tags.yml
View file

@ -1,4 +1,4 @@
variables:
CONDITIONAL_BUILD_ANGLE_TAG: 384145a4023315dae658259bee07c43a
CONDITIONAL_BUILD_FLUSTER_TAG: 3cef43c49c9aa9cda3cc1584ea43cb8b
CONDITIONAL_BUILD_FLUSTER_TAG: 6f28ab2217c79b336908b9e28d6a532c
CONDITIONAL_BUILD_PIGLIT_TAG: a19e424b8a3f020dbf1b9dd29f220a4f

2
.gitlab-ci/container/build-fluster.sh
View file

@ -26,7 +26,7 @@ export SKIP_UPDATE_FLUSTER_VECTORS=false
check_fluster()
{
S3_PATH_FLUSTER="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_VECTORS_VERSION}/vectors.tar.zst"
S3_PATH_FLUSTER="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst"
if curl -L --retry 4 -f --retry-connrefused --retry-delay 30 -s --head \
"https://${S3_PATH_FLUSTER}"; then
echo "Fluster vectors are up-to-date, skip rebuilding them."

4
.gitlab-ci/image-tags.yml
View file

@ -25,7 +25,7 @@ variables:
DEBIAN_TEST_ANDROID_TAG: "20250502-depot-57"
DEBIAN_TEST_GL_TAG: "20250502-depot-57"
DEBIAN_TEST_VIDEO_TAG: "20250423-rootfs"
DEBIAN_TEST_VIDEO_TAG: "20250503-fluster"
DEBIAN_TEST_VK_TAG: "20250423-rootfs"
DEBIAN_PYUTILS_TAG: "20250422-ci-fairy"
@ -38,8 +38,6 @@ variables:
KERNEL_REPO: "gfx-ci/linux"
PKG_REPO_REV: "95bf62c"
FLUSTER_VECTORS_VERSION: "5"
WINDOWS_X64_MSVC_TAG: "20250129-llvm19"
WINDOWS_X64_BUILD_TAG: "20250129-llvm19"