From 82538647c107501ce215bc68c55d41d036282c89 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 24 Feb 2020 11:29:42 +1000
Subject: [PATCH] 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>
---
 .gitlab-ci.yml            | 11 +++++------
 .gitlab-ci/gitlab-ci.tmpl | 11 +++++------
 .gitlab-ci/meson-build.sh |  5 +++++
 3 files changed, 15 insertions(+), 12 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
diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl
index 8fb165d..89ae3e2 100644
--- a/.gitlab-ci/gitlab-ci.tmpl
+++ b/.gitlab-ci/gitlab-ci.tmpl
@@ -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
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index cf8acd5..4423897 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -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