Mesa (main): ci: add Linux build of apitrace
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 24 06:00:45 UTC 2022
Module: Mesa
Branch: main
Commit: 433c436c32d68d48fb477a0a588e25d865bd90c2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=433c436c32d68d48fb477a0a588e25d865bd90c2
Author: Charlie Turner <cturner at igalia.com>
Date: Wed Jun 22 10:35:26 2022 +0300
ci: add Linux build of apitrace
This is needed for some of Valve's GL traces to run.
Additionally, make the building commands for apitrace more standard.
Contributed by Andres Gomez.
Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17184>
---
.gitlab-ci/container/build-apitrace.sh | 2 +-
.gitlab-ci/container/debian/x86_test-vk.sh | 4 ++++
.gitlab-ci/image-tags.yml | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
index 91570b7f782..f0f025175e3 100644
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -9,7 +9,7 @@ pushd /apitrace
git checkout "$APITRACE_VERSION"
git submodule update --init --depth 1 --recursive
cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on $EXTRA_CMAKE_ARGS
-ninja -C _build
+cmake --build _build --parallel --target apitrace eglretrace
mkdir build
cp _build/apitrace build
cp _build/eglretrace build
diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh
index 465d2535f32..57026d26e95 100644
--- a/.gitlab-ci/container/debian/x86_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_test-vk.sh
@@ -158,6 +158,10 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
. .gitlab-ci/container/build-deqp.sh
+############### Build apitrace
+
+. .gitlab-ci/container/build-apitrace.sh
+
############### Build gfxreconstruct
. .gitlab-ci/container/build-gfxreconstruct.sh
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6252d953e69..6cdb5f69b5a 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -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-06-20-apitrace-update"
- DEBIAN_X86_TEST_VK_TAG: "2022-06-19-gfxinfo-mupuf"
+ DEBIAN_X86_TEST_GL_TAG: "2022-06-21-apitrace-linux"
+ DEBIAN_X86_TEST_VK_TAG: "2022-06-21-apitrace-linux"
FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
- KERNEL_ROOTFS_TAG: "2022-06-20-apitrace-update"
+ KERNEL_ROOTFS_TAG: "2022-06-21-apitrace-linux"
WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"
More information about the mesa-commit
mailing list