From 65bafa2a35aca4117bf43e79eed9b981f9764237 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Thu, 9 Jun 2022 13:00:24 +0200 Subject: [PATCH] ci: uprev piglit 2022-06-09 Reviewed-by: Emma Anholt Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/build-piglit.sh | 2 +- .gitlab-ci/image-tags.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 443d5fb4bb9..7d8af6277da 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -4,7 +4,7 @@ set -ex git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout 5e7d4a7b1df385f1e2b08b2b81d75f039e8be64b +git checkout b2c9d8f56b45d79f804f4cb5ac62520f0edd8988 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS ninja $PIGLIT_BUILD_TARGETS diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index d02fab50d52..cc28f7d35c1 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -8,11 +8,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-06-01-piglit-update" - DEBIAN_X86_TEST_VK_TAG: "2022-06-01-piglit-update" + DEBIAN_X86_TEST_GL_TAG: "2022-06-09-piglit-update" + DEBIAN_X86_TEST_VK_TAG: "2022-06-09-piglit-update" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-06-01-piglit-update" + KERNEL_ROOTFS_TAG: "2022-06-09-piglit-update" WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_TAG: "2022-27-05-server_2022"