xorgproto: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |   20 ++++++++++++++++++++
 Makefile.am    |    4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 24e4a847a949a08e3ecd81539cf0f638b81cf6f1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Feb 24 15:35:42 2021 +1000

    gitlab CI: add a job to build with meson from the autotools tarball
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75a53dd..43e4288 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,27 @@ autotools:
     - ../configure --prefix="$PWD/../_inst" $CONFIGURE_OPTIONS
     - make install
     - make distcheck
+    - mv xorgproto*.tar.gz ..
     - popd
+  artifacts:
+    paths:
+      - xorgproto*.tar.gz
+
+meson from tarball:
+  extends:
+    - .fdo.distribution-image at arch
+  stage: test
+  script:
+    - mkdir -p _tarball_build
+    - tar xf xorgproto-*.tar.gz -C _tarball_build
+    - pushd _tarball_build/xorgproto-*
+    - meson builddir
+    - meson configure builddir
+    - ninja -C builddir test
+  needs:
+    - autotools
+  variables:
+    GIT_STRATEGY: none
 
 check evdev keysyms:
   extends:
commit 7b6836f0d5ba44d94abb7b3163ef715d023b270c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Feb 24 15:27:55 2021 +1000

    autotools: add the keysym-generator script to EXTRA_DIST
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Makefile.am b/Makefile.am
index 59c49cf..ec2188f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -496,6 +496,8 @@ EXTRA_DIST = \
     meson.build \
     meson_options.txt \
     man/Xprint.man \
-    man/Xprint.sgml
+    man/Xprint.sgml \
+    scripts/keysym-generator.py
+
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy