xorgproto: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |   18 ++++++++++++++++--
 configure.ac   |    1 +
 meson.build    |    1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 34b8a46e640c655b5e552410817fa70ca558f4d2
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Apr 30 09:11:43 2021 +1000

    gitlab CI: check that the autotools and meson versions are in sync
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65dd0d2..bfee17e 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-02-24.0'
+  FDO_DISTRIBUTION_TAG: '2021-04-30.0'
 
 stages:
   - prep
@@ -29,7 +29,7 @@ container-prep:
     # minimal set of packages required to build and install
     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'
+    EXTRA_PACKAGES: 'git libevdev python python-libevdev python-black jq'
     FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $EXTRA_PACKAGES
 
 meson:
@@ -121,3 +121,17 @@ check formatting:
   only:
     changes:
       - scripts/keysym-generator.py
+
+check versions are in sync:
+  extends:
+    - .fdo.distribution-image at arch
+  stage: test
+  script:
+    - autoreconf -ivf
+    - ./configure --version | head -n 1 | sed -e 's/xorgproto configure //' > autotools.version
+    - |
+      meson builddir
+      pushd builddir
+      meson introspect --projectinfo | jq -r '.version' > ../meson.version
+      popd
+    - diff -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false)
diff --git a/configure.ac b/configure.ac
index 523f711..185f592 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
+# keep version in sync with meson.build
 AC_INIT([xorgproto], [2021.3],
         [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/meson.build b/meson.build
index 5f3622a..f6ec73c 100644
--- a/meson.build
+++ b/meson.build
@@ -18,6 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+# keep version in sync with configure.ac
 project('xorgproto', 'c', license : 'MIT', version : '2021.3')
 cc = meson.get_compiler('c')