From 6c74c315d28b923dab01b061423b6b90bd74eff8 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 1 Nov 2023 17:53:06 -0700 Subject: [PATCH] set-version - Yes increment for 5.68.x=>5.69.alpha. But OK to skip alpha2, beta2, beta3, etc --- tools/bin/scripts/set-version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bin/scripts/set-version.php b/tools/bin/scripts/set-version.php index 489867d015..3e5b0cd453 100755 --- a/tools/bin/scripts/set-version.php +++ b/tools/bin/scripts/set-version.php @@ -83,7 +83,7 @@ updateFile("sql/test_data_second_domain.mysql", function ($content) use ($newVer }); // Update core extensions if this is a stable release -$infoXmls = isPreRelease($newVersion) ? [] : findCoreInfoXml(); +$infoXmls = isPreReleaseIncrement($newVersion) ? [] : findCoreInfoXml(); foreach ($infoXmls as $infoXml) { updateXmlFile($infoXml, function (DOMDocument $dom) use ($newVersion) { // Update extension version @@ -192,8 +192,8 @@ function isVersionValid($v) { return $v && preg_match('/^[0-9a-z\.\-]+$/', $v); } -function isPreRelease(string $v): bool { - return (bool) preg_match('/[a-z]+/', $v); +function isPreReleaseIncrement(string $v): bool { + return (bool) preg_match('/(alpha|beta)/', $v) && !preg_match('/(beta1|alpha1)$/', $v); } /** -- 2.25.1