From fe649b38c412a07c615eab890c2b252e26c4b559 Mon Sep 17 00:00:00 2001
From: Charlie Turner <cturner@igalia.com>
Date: Wed, 22 Jun 2022 11:05:37 +0300
Subject: [PATCH] ci: upgrade gfxreconstruct build to v0.9.10

Additionally improve the style of the build script.

 - Instead of using platform build tools, use the CMake wrappers
 - Instead of build all targets, then manually stripping, use the
   CMake helpers.

Contributed by Andres Gomez.

Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17184>
---
 .gitlab-ci/container/build-gfxreconstruct.sh | 16 ++++++++--------
 .gitlab-ci/image-tags.yml                    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/container/build-gfxreconstruct.sh b/.gitlab-ci/container/build-gfxreconstruct.sh
index 59605668926..255335e65a7 100644
--- a/.gitlab-ci/container/build-gfxreconstruct.sh
+++ b/.gitlab-ci/container/build-gfxreconstruct.sh
@@ -2,18 +2,18 @@
 
 set -ex
 
-GFXRECONSTRUCT_VERSION=3738decc2f4f9ff183818e5ab213a75a79fb7ab1
+GFXRECONSTRUCT_VERSION=5ed3caeecc46e976c4df31e263df8451ae176c26
 
-git clone https://github.com/LunarG/gfxreconstruct.git --single-branch -b master --no-checkout /gfxreconstruct
+git clone https://github.com/LunarG/gfxreconstruct.git \
+    --single-branch \
+    -b master \
+    --no-checkout \
+    /gfxreconstruct
 pushd /gfxreconstruct
 git checkout "$GFXRECONSTRUCT_VERSION"
 git submodule update --init
 git submodule update
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release
-ninja -C _build gfxrecon-replay gfxrecon-info
-mkdir -p build/bin
-install _build/tools/replay/gfxrecon-replay build/bin
-install _build/tools/info/gfxrecon-info build/bin
-strip build/bin/*
+cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/gfxreconstruct/build -DBUILD_WERROR=OFF
+cmake --build _build --parallel --target tools/{replay,info}/install/strip
 find . -not -path './build' -not -path './build/*' -delete
 popd
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6cdb5f69b5a..60e9a8f0a5e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
    DEBIAN_X86_TEST_GL_TAG: "2022-06-21-apitrace-linux"
-   DEBIAN_X86_TEST_VK_TAG: "2022-06-21-apitrace-linux"
+   DEBIAN_X86_TEST_VK_TAG: "2022-06-22-gfxreconstruct-0.9.10"
 
    FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
    KERNEL_ROOTFS_TAG: "2022-06-21-apitrace-linux"