xorgproto: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 882505e818e7a4b2f7df42f6f096407b9ee6e9c6
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Feb 24 14:20:56 2021 +1000

    gitlab CI: add an autotools distcheck job
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3700fbd..75a53dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ variables:
   FDO_UPSTREAM_REPO: 'xorg/proto/xorgproto'
   # Changing the tag will rebuild the container images. The value is just a
   # string, but we use the date for human benefits.
-  FDO_DISTRIBUTION_TAG: '2021-01-21.1'
+  FDO_DISTRIBUTION_TAG: '2021-02-24.0'
 
 stages:
   - prep
@@ -27,7 +27,7 @@ container-prep:
   variables:
     GIT_STRATEGY: none
     # minimal set of packages required to build and install
-    BASE_PACKAGES: 'meson ninja gcc'
+    BASE_PACKAGES: 'meson ninja gcc autoconf automake make xorg-util-macros pkgconf'
     # extra packages we need for various tests
     EXTRA_PACKAGES: 'git libevdev python python-libevdev python-black'
     FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $EXTRA_PACKAGES
@@ -46,6 +46,22 @@ meson:
     - ninja -C builddir test
     - ninja -C builddir install
 
+autotools:
+  extends:
+    - .fdo.distribution-image at arch
+  stage: build
+  parallel:
+    matrix:
+      - CONFIGURE_OPTIONS: ['', '--enable-legacy']
+  script:
+    - mkdir -p ../_inst _build
+    - autoreconf -ivf
+    - pushd _build
+    - ../configure --prefix="$PWD/../_inst" $CONFIGURE_OPTIONS
+    - make install
+    - make distcheck
+    - popd
+
 check evdev keysyms:
   extends:
     - .fdo.distribution-image at arch