[master] 26e92d158 circleci: Pass configure options to distcheck

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Apr 15 08:24:05 UTC 2021


commit 26e92d158080f34347d529b3952d0e6d4dd94f22
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Apr 14 22:46:33 2021 +0200

    circleci: Pass configure options to distcheck
    
    Otherwise any futile attempt at disabling developer warnings (even
    temporarily) will be neutered by the distcheck target.
    
    Refs f254fff7e9682f4c0bb2e0636a07945a5dd89b83
    Closes #3592

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 163de78dd..61e9a4726 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,6 +13,14 @@ parameters:
   pkg-commit:
     type: string
     default: "master"
+  configure_args:
+    type: string
+    default: |
+        --with-unwind \
+        --enable-developer-warnings \
+        --enable-debugging-symbols \
+        --disable-stack-protector \
+        --with-persistent-storage \
 jobs:
   dist:
     description: Builds varnish-x.y.z.tar.gz that is used later for the packaging jobs
@@ -247,16 +255,14 @@ jobs:
                 autoreconf -i -v
             sudo -u varnish \
                 ./configure \
-            	--quiet \
-            	--with-unwind \
-            	--enable-developer-warnings \
-            	--enable-debugging-symbols \
-            	--disable-stack-protector \
-            	--with-persistent-storage \
-            	<< parameters.extra_conf >>
+                --quiet \
+                << pipeline.parameters.configure_args >> \
+                << parameters.extra_conf >>
             sudo -u varnish \
-            	--preserve-env=ASAN_OPTIONS,LSAN_OPTIONS,TSAN_OPTIONS,UBSAN_OPTIONS \
-            	make distcheck VERBOSE=1 -j 12 -k
+                --preserve-env=ASAN_OPTIONS,LSAN_OPTIONS,TSAN_OPTIONS,UBSAN_OPTIONS \
+                make distcheck VERBOSE=1 -j 12 -k \
+                DISTCHECK_CONFIGURE_FLAGS="<< pipeline.parameters.configure_args >> \
+                << parameters.extra_conf >>"
 
   collect_packages:
     docker:


More information about the varnish-commit mailing list