Skip to content

Commit cf228ac

Browse files
committed
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.
1 parent fe9cd66 commit cf228ac

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

.github/workflows/linux.yml

+13
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,19 @@ jobs:
3131
sudo apt install -y \
3232
doxygen libxcb-xkb-dev valgrind ninja-build \
3333
libwayland-dev wayland-protocols bison graphviz
34+
- name: Install xkeyboard-config
35+
run: |
36+
# Install master version of xkeyboard-config, in order to ensure
37+
# its latest version works well with xkbcommon.
38+
# HACK: We use meson to install, while it would be cleaner
39+
# to create a proper package to install or use some PPA.
40+
pushd ~
41+
git clone --depth=1 https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git
42+
cd "xkeyboard-config"
43+
BUILDDIR=build
44+
meson setup $BUILDDIR -Dprefix=/usr
45+
meson install -C $BUILDDIR
46+
popd
3447
- name: Setup
3548
run: |
3649
# -gdwarf-4 - see https://github.com/llvm/llvm-project/issues/56550.

0 commit comments

Comments
 (0)