diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 899d5547..faa93ade 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,24 +122,6 @@ variables: reports: junit: $MESON_BUILDDIR/junit-*.xml -# The default build instructions -.default_build: - script: - - rm -rf "$MESON_BUILDDIR" - - meson "$MESON_BUILDDIR" $MESON_ARGS - - meson configure "$MESON_BUILDDIR" - - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS - - if test x"$MESON_TEST_ARGS" != "x"; then - echo "Running meson test -C \"$MESON_BUILDDIR\" $MESON_TEST_ARGS"; - meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS || touch .failed; - ./.gitlab-ci/meson-junit-report.py - --project-name=libinput - --job-id="$CI_JOB_ID" - --output="$MESON_BUILDDIR/junit-$CI_JOB_NAME-report.xml" - "$MESON_BUILDDIR/meson-logs/testlog.json"; - test -f .failed && exit 1; - fi - ################################################################# # # # prep stage # @@ -466,8 +448,9 @@ freebsd:11.2@container-clean: extends: - .policy - .default_artifacts - - .default_build stage: build + script: + - .gitlab-ci/meson-build.sh dependencies: [] # |