20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228039
Change subject: Update mediawiki version regex to support semantic version
......................................................................
Update mediawiki version regex to support semantic version
This new regex should be backward-compatible with the old version
numbering, but will also match semantic-versioning-compatible versions
Bug: T67306
Change-Id: I4aa3356595fd18e5e4cadfebb2c27878feefca77
---
M multiversion/checkoutMediaWiki.php
M multiversion/defines.php
M multiversion/deleteMediaWiki
M multiversion/updateWikiversions.php
4 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/39/228039/1
diff --git a/multiversion/checkoutMediaWiki.php
b/multiversion/checkoutMediaWiki.php
index df0be95..0f1dca3 100644
--- a/multiversion/checkoutMediaWiki.php
+++ b/multiversion/checkoutMediaWiki.php
@@ -24,7 +24,7 @@
if ( count( $argv ) >= 3 ) {
$gitVersion = $argv[1]; // e.g. "X.XXwmfX"
$dstVersion = $argv[2]; // e.g. "php-X.XXwmfX"
- if ( preg_match( '/^php-(\d+\.\d+wmf\d+|master)$/',
$dstVersion, $m ) ) {
+ if ( preg_match( MEDIAWIKI_DIRECTORY_REGEX, $dstVersion, $m ) )
{
$dstVersionNum = $m[1]; // everything after 'php-'
$argsValid = true;
}
diff --git a/multiversion/defines.php b/multiversion/defines.php
index dde1058..8bba5b0 100644
--- a/multiversion/defines.php
+++ b/multiversion/defines.php
@@ -4,3 +4,5 @@
*/
define( 'MEDIAWIKI_STAGING_DIR', '/srv/mediawiki-staging' );
define( 'MEDIAWIKI_DEPLOYMENT_DIR', '/srv/mediawiki' );
+define( 'MEDIAWIKI_VERSION_REGEX', '(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)');
+define( 'MEDIAWIKI_DIRECTORY_REGEX', '/^php-'.MEDIAWIKI_VERSION_REGEX.'$/');
\ No newline at end of file
diff --git a/multiversion/deleteMediaWiki b/multiversion/deleteMediaWiki
index 3aedd72..28c969e 100755
--- a/multiversion/deleteMediaWiki
+++ b/multiversion/deleteMediaWiki
@@ -20,7 +20,7 @@
$argsValid = false;
if ( count( $argv ) >= 2 ) {
$dstVersion = $argv[1]; // e.g. "php-X.XXwmfX"
- if ( preg_match( '/^php-(\d+\.\d+wmf\d+|master)$/',
$dstVersion, $m ) ) {
+ if ( preg_match( MEDIAWIKI_DIRECTORY_REGEX, $dstVersion, $m ) )
{
$dstVersionNum = $m[1]; // everything after 'php-'
$argsValid = true;
}
diff --git a/multiversion/updateWikiversions.php
b/multiversion/updateWikiversions.php
index 2530847..2f5bb9e 100644
--- a/multiversion/updateWikiversions.php
+++ b/multiversion/updateWikiversions.php
@@ -33,7 +33,7 @@
$dbList = MWWikiversions::readDbListFile( "$common/$dbListName.dblist"
);
$newVersion = $argv[2];
- if ( !preg_match( '/^php-(\d+\.\d+wmf\d+|master)$/', $newVersion ) ||
!is_dir( "$common/$newVersion" ) ) {
+ if ( !preg_match( MEDIAWIKI_DIRECTORY_REGEX, $newVersion ) || !is_dir(
"$common/$newVersion" ) ) {
print "Invalid version specifier: $newVersion\n";
exit( 1 );
}
--
To view, visit https://gerrit.wikimedia.org/r/228039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aa3356595fd18e5e4cadfebb2c27878feefca77
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
