Commit 34b8a46e authored by Peter Hutterer's avatar Peter Hutterer
Browse files

gitlab CI: check that the autotools and meson versions are in sync


Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent b6bc35b8
Pipeline #310990 passed with stages
in 1 minute and 21 seconds
......@@ -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@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)
......@@ -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])
......
......@@ -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')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment