[6.0] 396fed02a circleci: Tolerate spaces in AC_INIT()

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Jun 21 13:43:11 UTC 2024


commit 396fed02a35860539646ebd82e664eb9a587867f
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Mar 19 10:19:58 2024 +0100

    circleci: Tolerate spaces in AC_INIT()
    
    Better diff with the --word-diff --word-diff-regex=. options.

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a9b6c5cc4..4c4d8e8d7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,9 +81,9 @@ jobs:
                   touch .is_weekly
                   # If version is "trunk", override version to add date
                   if grep 'AC_INIT.*trunk.*' ./configure.ac; then
-                      sed -i -e "s/AC_INIT(\[\(.*\)\],\[\(.*\)\],\[\(.*\)\])/AC_INIT([\1],[$(date +%Y%m%d)],[\3])/" ./configure.ac
+                      sed -i -e "s/AC_INIT(\[\(.*\)\],\s*\[\(.*\)\],\s*\[\(.*\)\])/AC_INIT([\1],[$(date +%Y%m%d)],[\3])/" ./configure.ac
                   else
-                      sed -i -e "s/AC_INIT(\[\(.*\)\],\[\(.*\)\],\[\(.*\)\])/AC_INIT([\1],[\2-$(date +%Y%m%d)],[\3])/" ./configure.ac
+                      sed -i -e "s/AC_INIT(\[\(.*\)\],\s*\[\(.*\)\],\s*\[\(.*\)\])/AC_INIT([\1],[\2-$(date +%Y%m%d)],[\3])/" ./configure.ac
                   fi
                   ./autogen.des
                   make dist -j 16


More information about the varnish-commit mailing list