From cf228acd26b8798e077ae83b5a1351af0b78a287 Mon Sep 17 00:00:00 2001 From: Pierre Le Marre Date: Mon, 18 Sep 2023 13:17:30 +0200 Subject: [PATCH] CI: Use git master for xkeyboard-config on Linux xkeyboard-config and xkbcommon projects are quite intertwined so we want things to blow up early. It also solves an issue with the x11comp test. --- .github/workflows/linux.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 21b20b5..bd1cfe6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -31,6 +31,19 @@ jobs: sudo apt install -y \ doxygen libxcb-xkb-dev valgrind ninja-build \ libwayland-dev wayland-protocols bison graphviz + - name: Install xkeyboard-config + run: | + # Install master version of xkeyboard-config, in order to ensure + # its latest version works well with xkbcommon. + # HACK: We use meson to install, while it would be cleaner + # to create a proper package to install or use some PPA. + pushd ~ + git clone --depth=1 https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git + cd "xkeyboard-config" + BUILDDIR=build + meson setup $BUILDDIR -Dprefix=/usr + meson install -C $BUILDDIR + popd - name: Setup run: | # -gdwarf-4 - see https://github.com/llvm/llvm-project/issues/56550. -- 2.7.4