From 864f0c682961218bc07e5537d4569b19c86e78e0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 15 Nov 2019 14:40:08 +1000
Subject: [PATCH] CI: deduplicate distcheck by making it a variable

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb611c3..e09c0ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,15 +86,7 @@ variables:
     - ./configure --disable-silent-rules $CONFIGURE_FLAGS
     - make
     - make check
-  <<: *default_artifacts
-
-.default_build_distcheck: &default_build_distcheck
-  script:
-    - autoreconf -ivf
-    - ./configure --disable-silent-rules $CONFIGURE_FLAGS
-    - make
-    - make check
-    - make distcheck
+    - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi
   <<: *default_artifacts
 
 #################################################################
@@ -373,8 +365,10 @@ alpine:latest@container-clean:
 .build@template:
   stage: build
   <<: *default_artifacts
-  <<: *default_build_distcheck
+  <<: *default_build
   dependencies: []
+  variables:
+    MAKE_ARGS: "distcheck"
 
 .fedora-build@template:
   stage: distro
@@ -479,12 +473,13 @@ centos:7@no-check:
   before_script:
     - yum remove -y check check-devel
 
-# doxygen is required for distcheck
 centos:7@no-doxygen:
   extends: .centos-custom-build@template
   before_script:
     - yum remove -y doxygen
   <<: *default_build
+  variables:
+    MAKE_ARGS: ''  # disable distcheck, requires doxygen
 
 # doxygen is required for distcheck
 centos:7@no-doxygen-check-valgrind:
@@ -492,6 +487,8 @@ centos:7@no-doxygen-check-valgrind:
   before_script:
     - yum remove -y doxygen valgrind check check-devel
   <<: *default_build
+  variables:
+    MAKE_ARGS: ''  # disable distcheck, requires doxygen
 
 centos:7@no-nm:
   extends: .centos-custom-build@template
-- 
2.7.4