Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/244735
Change subject: Update comments/hints for WMF MW version format changes
......................................................................
Update comments/hints for WMF MW version format changes
Change-Id: I3366a223f23d9a38b07c4556c3a2453ecba092b8
---
M multiversion/checkoutMediaWiki.php
M multiversion/defines.php
M multiversion/deleteMediaWiki
M multiversion/updateGroup1
M multiversion/updateWikiversions.php
5 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/35/244735/1
diff --git a/multiversion/checkoutMediaWiki.php
b/multiversion/checkoutMediaWiki.php
index 4dbaa30..0154503 100644
--- a/multiversion/checkoutMediaWiki.php
+++ b/multiversion/checkoutMediaWiki.php
@@ -8,7 +8,7 @@
* symlinks will also be created.
*
* The first argument is the git branch (relative to wmf).
- * This is typically a version of the format "X.XXwmfX" ("e.g. 1.17wmf1").
+ * This is typically a version of the format "X.XX-wmf.X" ("e.g. 1.27-wmf.1").
* The second argument is the target path (relative to MEDIAWIKI_STAGING_DIR)
* to store local copy of the git checkout. This is typically of the format
"php-X.XX".
*
@@ -22,8 +22,8 @@
$argsValid = false;
if ( count( $argv ) >= 3 ) {
- $gitVersion = $argv[1]; // e.g. "X.XXwmfX"
- $dstVersion = $argv[2]; // e.g. "php-X.XXwmfX"
+ $gitVersion = $argv[1]; // e.g. "X.XX-wmf.X"
+ $dstVersion = $argv[2]; // e.g. "php-X.XX-wmf.X"
if ( preg_match( MEDIAWIKI_DIRECTORY_REGEX, $dstVersion, $m ) )
{
$dstVersionNum = $m[1]; // everything after 'php-'
$argsValid = true;
@@ -31,7 +31,7 @@
}
if ( !$argsValid ) {
- print "Usage: checkoutMediaWiki X.XXwmfX php-X.XXwmfX\n";
+ print "Usage: checkoutMediaWiki X.XX-wmf.X php-X.XX-wmf.X\n";
exit( 1 );
}
diff --git a/multiversion/defines.php b/multiversion/defines.php
index 8bba5b0..e651cb7 100644
--- a/multiversion/defines.php
+++ b/multiversion/defines.php
@@ -5,4 +5,4 @@
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
+define( 'MEDIAWIKI_DIRECTORY_REGEX', '/^php-'.MEDIAWIKI_VERSION_REGEX.'$/');
diff --git a/multiversion/deleteMediaWiki b/multiversion/deleteMediaWiki
index 755e74b..9c7088a 100755
--- a/multiversion/deleteMediaWiki
+++ b/multiversion/deleteMediaWiki
@@ -19,7 +19,7 @@
$argsValid = false;
if ( count( $argv ) >= 2 ) {
- $dstVersion = $argv[1]; // e.g. "php-X.XXwmfX"
+ $dstVersion = $argv[1]; // e.g. "php-X.XX-wmf.X"
if ( preg_match( MEDIAWIKI_DIRECTORY_REGEX, $dstVersion, $m ) )
{
$dstVersionNum = $m[1]; // everything after 'php-'
$argsValid = true;
@@ -27,7 +27,7 @@
}
if ( !$argsValid ) {
- print "Usage: deleteMediaWiki php-X.XXwmfX\n";
+ print "Usage: deleteMediaWiki php-X.XX-wmf.X\n";
exit( 1 );
}
diff --git a/multiversion/updateGroup1 b/multiversion/updateGroup1
index 4370216..14aa1ad 100755
--- a/multiversion/updateGroup1
+++ b/multiversion/updateGroup1
@@ -3,7 +3,7 @@
error_reporting( E_ALL );
if ( count( $argv ) !== 2 ) {
- print "Usage: updateGroup1 php-X.XXwmfX\n";
+ print "Usage: updateGroup1 php-X.XX-wmf.X\n";
exit( 1 );
}
diff --git a/multiversion/updateWikiversions.php
b/multiversion/updateWikiversions.php
index 2f5bb9e..0909c33 100644
--- a/multiversion/updateWikiversions.php
+++ b/multiversion/updateWikiversions.php
@@ -12,9 +12,9 @@
* and wikiversions.cdb files on tin, they will still need to be synced to push
* the upgrade/downgrade to the apaches.
*
- * The first argument is the old version, typically of the format
"php-X.XXwmfX".
+ * The first argument is the old version, typically of the format
"php-X.XX-wmf.X".
* If "all" is given, then all wikis will be switched over.
- * The second argument is the new version, typically of the format
"php-X.XXwmfX".
+ * The second argument is the new version, typically of the format
"php-X.XX-wmf.X".
* The third argument is the name of a .dblist file under the common/ dir.
*
* @return void
@@ -25,7 +25,7 @@
$jsonPath = getRealmSpecificFilename( MEDIAWIKI_STAGING_DIR .
'/wikiversions.json' );
if ( count( $argv ) !== 3 ) {
- print "Usage: updateWikiversions <name>.dblist php-X.XXwmfX\n";
+ print "Usage: updateWikiversions <name>.dblist
php-X.XX-wmf.X\n";
exit( 1 );
}
--
To view, visit https://gerrit.wikimedia.org/r/244735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3366a223f23d9a38b07c4556c3a2453ecba092b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
