Let's invoke the same meson steps for every build task.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
expire_in: 1 week
when: on_failure
reports:
- junit: junit-*.xml
+ junit: $MESON_BUILDDIR/junit-*.xml
.autotools_build:
extends:
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
#################################################################
# #
- dnf remove -y check check-devel
variables:
MESON_ARGS: -Dtests=disabled
+ SKIP_MESON_TEST: 1
# doxygen is required for dist
no-doxygen:meson:
variables:
MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled
NINJA_ARGS: ''
+ SKIP_MESON_TEST: 1
enable-gcov:meson:
extends: .fedora-custom-build@meson-template
extends: .fedora-custom-build@meson-template
variables:
NINJA_ARGS: 'scan-build'
+ SKIP_MESON_TEST: 1
soname:
stage: build
expire_in: 1 week
when: on_failure
reports:
- junit: junit-*.xml
+ junit: $MESON_BUILDDIR/junit-*.xml
.autotools_build:
extends:
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
#################################################################
# #
- dnf remove -y check check-devel
variables:
MESON_ARGS: -Dtests=disabled
+ SKIP_MESON_TEST: 1
# doxygen is required for dist
no-doxygen:meson:
variables:
MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled
NINJA_ARGS: ''
+ SKIP_MESON_TEST: 1
enable-gcov:meson:
extends: .fedora-custom-build@meson-template
extends: .fedora-custom-build@meson-template
variables:
NINJA_ARGS: 'scan-build'
+ SKIP_MESON_TEST: 1
soname:
stage: build
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