fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 02:30:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Move apitrace to test-base container

Browse source 
Instead of building apitrace in each of test-gl and test-vk, just build
it straight into test-base.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32927>
This commit is contained in:
Daniel Stone 2024-10-11 10:05:17 -04:00 • committed by Marge Bot
parent 3be9d71537
commit 175b6d02ea
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.gitlab-ci/container/debian/test-base.sh
View file

@ -47,13 +47,27 @@ EPHEMERAL=(
libegl-dev libegl-dev
libelf-dev libelf-dev
libepoxy-dev libepoxy-dev
libexpat1-dev
libgbm-dev libgbm-dev
libgles2-mesa-dev
liblz4-dev
libpciaccess-dev libpciaccess-dev
libssl-dev libssl-dev
libvulkan-dev libvulkan-dev
libudev-dev
libwaffle-dev
libwayland-dev libwayland-dev
libx11-xcb-dev libx11-xcb-dev
libxcb-dri2-0-dev
libxcb-dri3-dev
libxcb-present-dev
libxfixes-dev
libxcb-ewmh-dev
libxext-dev libxext-dev
libxkbcommon-dev
libxrandr-dev
libxrender-dev
libzstd-dev
"llvm-${LLVM_VERSION}-dev" "llvm-${LLVM_VERSION}-dev"
make make
meson meson
@ -190,6 +204,12 @@ fi
. .gitlab-ci/container/build-deqp-runner.sh . .gitlab-ci/container/build-deqp-runner.sh
############### Build apitrace
uncollapsed_section_switch apitrace "Building apitrace"
. .gitlab-ci/container/build-apitrace.sh
############### Uninstall the build software ############### Uninstall the build software
uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system" uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"

4
.gitlab-ci/container/debian/test-gl.sh
View file

@ -100,10 +100,6 @@ DEQP_TARGET=surfaceless \
rm -rf /VK-GL-CTS rm -rf /VK-GL-CTS
############### Build apitrace
. .gitlab-ci/container/build-apitrace.sh
############### Build validation layer for zink ############### Build validation layer for zink
. .gitlab-ci/container/build-vulkan-validation.sh . .gitlab-ci/container/build-vulkan-validation.sh

4
.gitlab-ci/container/debian/test-vk.sh
View file

@ -104,10 +104,6 @@ DEQP_TARGET=default \
rm -rf /VK-GL-CTS rm -rf /VK-GL-CTS
############### Build apitrace
. .gitlab-ci/container/build-apitrace.sh
############### Build Fossilize ############### Build Fossilize
. .gitlab-ci/container/build-fossilize.sh . .gitlab-ci/container/build-fossilize.sh