Commit 4b5ce025 authored by Olivier Fourdan's avatar Olivier Fourdan 🛠
Browse files

ci: add libdecor



Add libdecor 0.1.0 to CI.

v2: Build with and without libdecor

Signed-off-by: Olivier Fourdan's avatarOlivier Fourdan <ofourdan@redhat.com>
parent a7fe8d18
Pipeline #587292 passed with stages
in 1 minute and 35 seconds
......@@ -11,7 +11,7 @@ variables:
FDO_UPSTREAM_REPO: xorg/xserver
FDO_DISTRIBUTION_VERSION: buster-slim
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
FDO_DISTRIBUTION_TAG: "2021-10-22"
FDO_DISTRIBUTION_TAG: "2022-05-04.1"
include:
- project: 'freedesktop/ci-templates'
......@@ -73,6 +73,12 @@ meson-noglamor:
MESON_EXTRA_OPTIONS: >
-Dglamor=false
meson-nolibdecor:
extends: meson
variables:
MESON_EXTRA_OPTIONS: >
-Dlibdecor=false
mingw-cross-build:
extends: .common-build-and-test
script:
......
......@@ -32,6 +32,7 @@ apt-get install -y \
libaudit-dev \
libbsd-dev \
libcairo2 \
libcairo2-dev \
libdbus-1-dev \
libdmx-dev \
libdrm-dev \
......@@ -47,6 +48,8 @@ apt-get install -y \
libglx-mesa0 \
libinput10 \
libnvidia-egl-wayland-dev \
libpango1.0-0 \
libpango1.0-dev \
libpciaccess-dev \
libpixman-1-dev \
libselinux1-dev \
......@@ -151,6 +154,14 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd ..
rm -rf weston
# Install libdecor for Xwayland
git clone https://gitlab.gnome.org/jadahl/libdecor.git --depth 1 --branch=0.1.0
cd libdecor
meson _build -D{demo,install_demo}=false
ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd ..
rm -rf libdecor
git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1
git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment