fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2026-02-03 14:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: re-use the meson-build.sh script for normal meson jobs

Browse source 
Let's invoke the same meson steps for every build task.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-24 11:29:42 +10:00
parent 15e0b024df
commit 82538647c1
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci.yml
View file

@ -92,7 +92,7 @@ variables:
expire_in: 1 week
when: on_failure
reports:
junit: junit-*.xml
junit: $MESON_BUILDDIR/junit-*.xml
.autotools_build:
extends:
@ -110,11 +110,7 @@ variables:
extends:
- .default_artifacts
script:
- meson "$MESON_BUILDDIR" $MESON_ARGS
- ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
- if ! [[ -z "$MESON_TEST_ARGS" ]]; then
meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
fi
- .gitlab-ci/meson-build.sh
#################################################################
# #
@ -754,6 +750,7 @@ no-check:meson:
- dnf remove -y check check-devel
variables:
MESON_ARGS: -Dtests=disabled
SKIP_MESON_TEST: 1
# doxygen is required for dist
no-doxygen:meson:
@ -772,6 +769,7 @@ no-doxygen-check-valgrind:meson:
variables:
MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled
NINJA_ARGS: ''
SKIP_MESON_TEST: 1
enable-gcov:meson:
extends: .fedora-custom-build@meson-template
@ -782,6 +780,7 @@ scan-build:meson:
extends: .fedora-custom-build@meson-template
variables:
NINJA_ARGS: 'scan-build'
SKIP_MESON_TEST: 1
soname:
stage: build

11
.gitlab-ci/gitlab-ci.tmpl
View file

@ -76,7 +76,7 @@ variables:
expire_in: 1 week
when: on_failure
reports:
junit: junit-*.xml
junit: $MESON_BUILDDIR/junit-*.xml
.autotools_build:
extends:
@ -94,11 +94,7 @@ variables:
extends:
- .default_artifacts
script:
- meson "$MESON_BUILDDIR" $MESON_ARGS
- ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
- if ! [[ -z "$MESON_TEST_ARGS" ]]; then
meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
fi
- .gitlab-ci/meson-build.sh
#################################################################
# #
@ -410,6 +406,7 @@ no-check:meson:
- dnf remove -y check check-devel
variables:
MESON_ARGS: -Dtests=disabled
SKIP_MESON_TEST: 1
# doxygen is required for dist
no-doxygen:meson:
@ -428,6 +425,7 @@ no-doxygen-check-valgrind:meson:
variables:
MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled
NINJA_ARGS: ''
SKIP_MESON_TEST: 1
enable-gcov:meson:
extends: .fedora-custom-build@meson-template
@ -438,6 +436,7 @@ scan-build:meson:
extends: .fedora-custom-build@meson-template
variables:
NINJA_ARGS: 'scan-build'
SKIP_MESON_TEST: 1
soname:
stage: build

5
.gitlab-ci/meson-build.sh
View file

@ -35,6 +35,11 @@ meson "$MESON_BUILDDIR" $MESON_ARGS
meson configure "$MESON_BUILDDIR"
ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
if [[ ! -z "$SKIP_MESON_TEST" ]]; then
echo "Skipping meson test"
exit 0
fi
# we still want to generate the reports, even if meson test fails
set +e
meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS --print-errorlogs