diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-01-10 16:10:55 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-01-10 16:10:55 -0800 |
| commit | 1a1e0a82b10d9b928574b0fe2e8af94e55efe918 (patch) | |
| tree | 09879b75dd8a7b624bf77114f983f39e44f36517 | |
| parent | 9740bd9bfa75a858853f07b8c06dd813ef692778 (diff) | |
gitlab CI: run meson instead of ninja for test & install steps
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8227d25..7e8a2aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,8 +93,8 @@ meson: - mkdir -p ../_inst - meson builddir --prefix="$PWD/../_inst" $MESON_OPTIONS - meson configure builddir - - ninja -C builddir test - - ninja -C builddir install + - meson test -C builddir + - meson install -C builddir autotools: extends: @@ -127,7 +127,7 @@ meson from tarball: - pushd _tarball_build/xorgproto-* - meson builddir - meson configure builddir - - ninja -C builddir test + - meson test -C builddir needs: - autotools variables: @@ -145,7 +145,7 @@ compare meson and autotools: - ln -sf $PWD/_meson_inst $PWD/_inst - meson builddir - meson configure builddir --prefix=$PWD/_inst - - ninja -C builddir install + - meson install -C builddir - rm $PWD/_inst - ln -sf $PWD/_autotools_inst $PWD/_inst - autoreconf -ivf @@ -179,9 +179,6 @@ check versions are in sync: 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 + - meson builddir + - meson introspect --projectinfo builddir | jq -r '.version' > meson.version - diff -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false) |