From 991706e73172371d97fa75737eee1a06cf333ecd Mon Sep 17 00:00:00 2001 From: MDW Date: Mon, 17 Nov 2025 22:05:33 +0100 Subject: [PATCH] FIX: Fix version extraction in setup_conf.sh (#36281) # FIX: Fix version extraction in setup_conf.sh The version extraction regex was updated to handle both DOL_VERSION and DOL_MAJOR_VERSION constants in version.inc.php. The version is now available as DOL_MAJOR_VERSION since 29b1e75 Co-authored-by: Laurent Destailleur --- dev/setup/phpunit/setup_conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/setup/phpunit/setup_conf.sh b/dev/setup/phpunit/setup_conf.sh index 3bd82e908af..0cc6f478eaf 100755 --- a/dev/setup/phpunit/setup_conf.sh +++ b/dev/setup/phpunit/setup_conf.sh @@ -45,7 +45,7 @@ function save_db_cache() ( cd "${TRAVIS_BUILD_DIR}/htdocs/install" || exit 1 # Get the target version from the version.inc.php file - target_version=$(sed -n "s/.*define('DOL_VERSION',[[:space:]]*'\\([0-9.]*\\).*/\\1/p" ../version.inc.php) ; echo $target_version + target_version=$(sed -n "s/.*define('DOL_\\(MAJOR_\\)\\?VERSION',[[:space:]]*'\\([0-9.]*\\).*/\\2/p" ../version.inc.php) ; echo $target_version # Default in case that failed target_version=${target_version:=22.0.0}