jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/344276 )

Change subject: Deploy ParserMigration extension
......................................................................


Deploy ParserMigration extension

A tool to compare RemexHtml output with Tidy. Requires core later than
I5285c0b1c6f42891c002637cd3e4bd2f54615940

Also fix a comment which was accidentally moved away from its correct
location.

Bug: T141586
Change-Id: Id3c43149d8fecd0cfaa028403c64e7005db40144
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 21 insertions(+), 3 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Chad: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ee261fa..4638db5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3512,12 +3512,25 @@
        };
 }
 
-# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
-#
-# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
+if ( $wmgUseParserMigration ) {
+       wfLoadExtension( 'ParserMigration' );
+       $wgParserMigrationTidiers = [
+               [
+                       'driver' => 'RaggettInternalHHVM',
+                       'tidyConfigFile' => $wgTidyConf,
+               ],
+               [
+                       'driver' => 'RemexHtml',
+               ],
+       ];
+}
 
 if ( $wmfRealm === 'labs' ) {
        require( "$wmfConfigDir/CommonSettings-labs.php" );
 }
 
+# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
+#
+# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
+
 require( "$wmfConfigDir/ExtensionMessages-$wmgVersionNumber.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dd57464..c5cca91 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18457,6 +18457,10 @@
        'foundationwiki' => true,
 ],
 
+'wmgUseParserMigration' => [
+       'default' => true,
+],
+
 ];
 
 ### WMF Labs override #####
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 74c0728..b6b725f 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -93,6 +93,7 @@
 $IP/extensions/PageTriage/PageTriage.php
 $IP/extensions/PageViewInfo/extension.json
 $IP/extensions/ParserFunctions/extension.json
+$IP/extensions/ParserMigration/extension.json
 $IP/extensions/ParsoidBatchAPI/extension.json
 $IP/extensions/PdfHandler/extension.json
 $IP/extensions/Petition/extension.json

-- 
To view, visit https://gerrit.wikimedia.org/r/344276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3c43149d8fecd0cfaa028403c64e7005db40144
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Greg Grossmeier <g...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to