Mesa (main): ci: uprev vkd3d-proton to 39d07dea2cef34bfb3ed39741f026bc637e3eec4

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 29f34cc8061f3dc2617b726f26c4b697ec3c49c6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29f34cc8061f3dc2617b726f26c4b697ec3c49c6

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Jun 17 09:25:14 2022 +0200

ci: uprev vkd3d-proton to 39d07dea2cef34bfb3ed39741f026bc637e3eec4

The 2.6 version is old (released 4 months ago), the latest contains
even more useful tests (+2900 tests). Use the master branch by default,
so it could be regularly updated.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17105>

---

 .gitlab-ci/container/build-vkd3d-proton.sh | 5 ++---
 .gitlab-ci/image-tags.yml                  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
index 7a689e00655..0c98a5c02e7 100644
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -2,8 +2,7 @@
 
 set -ex
 
-VKD3D_PROTON_VERSION="2.6"
-VKD3D_PROTON_COMMIT="3e5aab6fb3e18f81a71b339be4cb5cdf55140980"
+VKD3D_PROTON_COMMIT="39d07dea2cef34bfb3ed39741f026bc637e3eec4"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
@@ -27,7 +26,7 @@ function build_arch {
   install -D -m755 -t "${VKD3D_PROTON_DST_DIR}/x${arch}/bin" "$VKD3D_PROTON_BUILD_DIR/build.${arch}/tests/d3d12"
 }
 
-git clone https://github.com/HansKristian-Work/vkd3d-proton.git --single-branch -b "v$VKD3D_PROTON_VERSION" --no-checkout "$VKD3D_PROTON_SRC_DIR"
+git clone https://github.com/HansKristian-Work/vkd3d-proton.git --single-branch -b master --no-checkout "$VKD3D_PROTON_SRC_DIR"
 pushd "$VKD3D_PROTON_SRC_DIR"
 git checkout "$VKD3D_PROTON_COMMIT"
 git submodule update --init --recursive
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index f8bcf0036da..f6870c0976f 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -9,7 +9,7 @@ variables:
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
    DEBIAN_X86_TEST_GL_TAG: "2022-06-09-piglit-update"
-   DEBIAN_X86_TEST_VK_TAG: "2022-06-14-vkd3d-proton"
+   DEBIAN_X86_TEST_VK_TAG: "2022-06-17-vkd3d-proton"
 
    FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
    KERNEL_ROOTFS_TAG: "2022-06-09-piglit-update"