diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 11:29:42 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 14:23:21 +1000 |
| commit | 82538647c107501ce215bc68c55d41d036282c89 (patch) | |
| tree | 5c41b2a1ac09f4c15ffcd6601da94715fb657d6d /.gitlab-ci.yml | |
| parent | 15e0b024dfc78da98721e3d82c445cbdf59159e2 (diff) | |
| download | libevdev-82538647c107501ce215bc68c55d41d036282c89.tar.gz | |
gitlab CI: re-use the meson-build.sh script for normal meson jobs
Let's invoke the same meson steps for every build task.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84e7b28..cab0b5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 |