From b0acae5f03c940db8c67c8b1f95f01fa15602274 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Fri, 26 Aug 2022 08:46:01 -0300 Subject: [PATCH] ci: Update to deqp-runner v0.16.0 for SKQP and CL support. Signed-off-by: Guilherme Gallo Acked-by: Karol Herbst Part-of: --- .gitlab-ci/container/build-deqp-runner.sh | 2 +- .gitlab-ci/image-tags.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index ac0ac0a0cc2..823c6691645 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -16,7 +16,7 @@ if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}" else # Install from package registry - DEQP_RUNNER_CARGO_ARGS="--version 0.15.0 ${EXTRA_CARGO_ARGS} -- deqp-runner" + DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner" fi cargo install --locked \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0ddc131a7d2..cf7e2b3bed9 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-11-04-kernel-6.0" + DEBIAN_BASE_TAG: "2022-11-08-skqp-runner" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3" @@ -11,11 +11,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-11-04-cts-zlib-cve" - DEBIAN_X86_TEST_VK_TAG: "2022-11-04-cts-vkd3d-proton" + DEBIAN_X86_TEST_GL_TAG: "2022-11-08-skqp-runner" + DEBIAN_X86_TEST_VK_TAG: "2022-11-08-skqp-runner" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2022-11-04-kernel-6.0" + KERNEL_ROOTFS_TAG: "2022-11-08-skqp-runner" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"