fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 07:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab-ci: Build Vulkan-Headers for CI

Browse source 
The version in Debian 11 (bullseye) is only slightly too old to build
vulkan-renderer.
We already build our own Mesa drivers to a newer version anyway, so it
should be possible to test vulkan-renderer in bullseye if it builds.
The actual Vulkan-Headers version here could actually be older and still
build, but was chosen to be same as in Debian 12 (bookworm) for now as
it is a tested version which has also been available for a while.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
This commit is contained in:
Erico Nunes 2025-07-10 11:53:53 +02:00 • committed by Marius Vlad
parent 3f81d2fd38
commit 7bc103e5a1
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -43,7 +43,7 @@
variables: variables:
FDO_UPSTREAM_REPO: wayland/weston FDO_UPSTREAM_REPO: wayland/weston
FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH" FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH"
FDO_DISTRIBUTION_TAG: '2025-07-4-v6.14' FDO_DISTRIBUTION_TAG: '2025-07-17-vulkan-headers'
include: include:

9
.gitlab-ci/build-deps.sh
View file

@ -151,6 +151,15 @@ cd ..
rm -rf drm rm -rf drm
fdo_log_section_end install_libdrm fdo_log_section_end install_libdrm
# Build and install Vulkan-Headers with a defined version, mostly because
# the version in Debian 11 (bullseye) is too old to build vulkan-renderer.
git clone --branch sdk-1.3.239.0 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers
cd Vulkan-Headers
cmake -G Ninja -B build
ninja ${NINJAFLAGS} -C build install
cd ..
rm -rf Vulkan-Headers
# Build and install our own version of Mesa. Debian provides a perfectly usable # Build and install our own version of Mesa. Debian provides a perfectly usable
# Mesa, however llvmpipe's rendering behaviour can change subtly over time. # Mesa, however llvmpipe's rendering behaviour can change subtly over time.
# This doesn't work for our tests which expect pixel-precise reproduction, so # This doesn't work for our tests which expect pixel-precise reproduction, so

10
.gitlab-ci/debian-install.sh
View file

@ -26,6 +26,13 @@ MESA_DEV_PKGS="
python3-mako python3-mako
" "
# These get temporarily installed for other build dependencies and then
# force-removed.
# cmake is used by Vulkan-Headers
BUILD_DEV_PKGS="
cmake
"
# Needed for running the custom-built mesa # Needed for running the custom-built mesa
MESA_RUNTIME_PKGS=" MESA_RUNTIME_PKGS="
libllvm${LLVM_VERSION} libllvm${LLVM_VERSION}
@ -125,6 +132,7 @@ apt-get -y --no-install-recommends install \
cargo rustc \ cargo rustc \
iproute2 udev \ iproute2 udev \
$MESA_DEV_PKGS \ $MESA_DEV_PKGS \
$BUILD_DEV_PKGS \
$MESA_RUNTIME_PKGS \ $MESA_RUNTIME_PKGS \
$LINUX_DEV_PKGS \ $LINUX_DEV_PKGS \
@ -138,4 +146,4 @@ fi
# And remove packages which are only required for our build dependencies, # And remove packages which are only required for our build dependencies,
# which we don't need bloating the image whilst we build and run Weston. # which we don't need bloating the image whilst we build and run Weston.
apt-get -y --autoremove purge $LINUX_DEV_PKGS $MESA_DEV_PKGS apt-get -y --autoremove purge $LINUX_DEV_PKGS $MESA_DEV_PKGS $BUILD_DEV_PKGS