From 7676bca9698042e01c41c8582b8641738c5d984d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 8 Feb 2021 17:32:20 +1000 Subject: gitlab CI: make sure we have the latest keysyms in libxkbcommon Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 085a644..1edc3e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,8 +219,13 @@ layout_tests: script: # make sure the custom layout resolves to something - ln -s "$INSTDIR/share/X11/xkb/symbols/us" "$INSTDIR/share/X11/xkb/symbols/custom" - - git clone https://github.com/xkbcommon/libxkbcommon + - rm -rf xorgproto libxkbcommon + # Get latest xorgproto so we definitely have all keysyms + - git clone --depth=1 https://gitlab.freedesktop.org/xorg/proto/xorgproto + - export X11_HEADERS_PREFIX="$PWD/xorgproto/" + - git clone --depth=1 https://github.com/xkbcommon/libxkbcommon - pushd libxkbcommon > /dev/null + - ./scripts/update-keysyms - meson builddir -Denable-wayland=false -Denable-x11=false -Denable-docs=false -Dxkb-config-root="$INSTDIR/share/X11/xkb" - ninja -C builddir - echo Running test script - this will take several minutes -- cgit v1.2.1