summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-02-08 17:32:20 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-03-24 07:10:40 +1000
commit7676bca9698042e01c41c8582b8641738c5d984d (patch)
tree96196c73321ad4dd327f4bdb6ccdfe913fbe2369 /.gitlab-ci.yml
parentb469c358d0a86352e9e176b255f4fa62644ed601 (diff)
downloadxkeyboard-config-7676bca9698042e01c41c8582b8641738c5d984d.tar.gz
gitlab CI: make sure we have the latest keysyms in libxkbcommon
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 6 insertions, 1 deletions
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