fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2025-12-20 07:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: run meson instead of ninja for test & install steps

Browse source 
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2023-01-10 16:10:55 -08:00
parent 9740bd9bfa
commit 1a1e0a82b1
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.yml
View file

@ -93,8 +93,8 @@ meson:
- mkdir -p ../_inst - mkdir -p ../_inst
- meson builddir --prefix="$PWD/../_inst" $MESON_OPTIONS - meson builddir --prefix="$PWD/../_inst" $MESON_OPTIONS
- meson configure builddir - meson configure builddir
- ninja -C builddir test - meson test -C builddir
- ninja -C builddir install - meson install -C builddir
autotools: autotools:
extends: extends:
@ -127,7 +127,7 @@ meson from tarball:
- pushd _tarball_build/xorgproto-* - pushd _tarball_build/xorgproto-*
- meson builddir - meson builddir
- meson configure builddir - meson configure builddir
- ninja -C builddir test - meson test -C builddir
needs: needs:
- autotools - autotools
variables: variables:
@ -145,7 +145,7 @@ compare meson and autotools:
- ln -sf $PWD/_meson_inst $PWD/_inst - ln -sf $PWD/_meson_inst $PWD/_inst
- meson builddir - meson builddir
- meson configure builddir --prefix=$PWD/_inst - meson configure builddir --prefix=$PWD/_inst
- ninja -C builddir install - meson install -C builddir
- rm $PWD/_inst - rm $PWD/_inst
- ln -sf $PWD/_autotools_inst $PWD/_inst - ln -sf $PWD/_autotools_inst $PWD/_inst
- autoreconf -ivf - autoreconf -ivf
@ -179,9 +179,6 @@ check versions are in sync:
script: script:
- autoreconf -ivf - autoreconf -ivf
- ./configure --version | head -n 1 | sed -e 's/xorgproto configure //' > autotools.version - ./configure --version | head -n 1 | sed -e 's/xorgproto configure //' > autotools.version
- | - meson builddir
meson builddir - meson introspect --projectinfo builddir | jq -r '.version' > meson.version
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 -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false)