AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: build and install native libwayland

Browse Source 
If the same image is used for both cross and native builds, the native
build needs to be installed as well.

Signed-off-by: Julian Orth <ju.orth@gmail.com>
Fixes: cf64ca6a0c ("ci: enable wayland platform in more debian builds")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36191>
This commit is contained in:
Julian Orth
2025-07-17 14:00:08 +02:00
committed by Marge Bot
parent a977e72c29
commit 62f855429a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci/container/build-wayland.sh
View File

@@ -22,14 +22,14 @@ git clone https://gitlab.freedesktop.org/wayland/wayland
cd wayland
git checkout "$LIBWAYLAND_VERSION"
# Build the scanner first in case we're a cross build
# Note the lack of EXTRA_MESON_ARGS here. This is always a native build
meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=false -Dscanner=true _scanner
meson install -C _scanner
# Now build libwayland using the given scanner
meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=false _build ${EXTRA_MESON_ARGS:-}
# Build the native library and scanner first in case we're a cross build.
# Note the lack of EXTRA_MESON_ARGS here.
meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=true _build
meson install -C _build
# Now build cross libwayland using the native scanner
meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=false _cross ${EXTRA_MESON_ARGS:-}
meson install -C _cross
cd ..
rm -rf wayland

14
.gitlab-ci/image-tags.yml
View File

@@ -19,20 +19,20 @@ include:
- .gitlab-ci/conditional-build-image-tags.yml
variables:
DEBIAN_BASE_TAG: "20250715-apitrace"
DEBIAN_BASE_TAG: "20250722-libwayland"
DEBIAN_BUILD_TAG: "20250710-libwayland"
DEBIAN_BUILD_TAG: "20250722-libwayland"
DEBIAN_TEST_ANDROID_TAG: "20250718-angle-6a"
DEBIAN_TEST_GL_TAG: "20250718-piglit-09"
DEBIAN_TEST_ANDROID_TAG: "20250722-libwayland"
DEBIAN_TEST_GL_TAG: "20250722-libwayland"
DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
DEBIAN_TEST_VK_TAG: "20250718-piglit-09"
DEBIAN_TEST_VK_TAG: "20250722-libwayland"
ALPINE_X86_64_BUILD_TAG: "20250709-libwayland"
ALPINE_X86_64_BUILD_TAG: "20250722-libwayland"
ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250717-lava"
FEDORA_X86_64_BUILD_TAG: "20250709-libwayland"
FEDORA_X86_64_BUILD_TAG: "20250722-libwayland"
KERNEL_TAG: "v6.14-mesa-4277"
KERNEL_REPO: "gfx-ci/linux"