jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394401 )
Change subject: Revert "Revert "wdbuild: add switch to ease killing""
......................................................................
Revert "Revert "wdbuild: add switch to ease killing""
This reverts commit 29cdd8ad4d7bb7f79c7bc1ef57cb1c40a8e92ffb.
Change-Id: I1f21767339d1ff36375a93ab7aa383414ec32117
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase-buildentry.php
3 files changed, 49 insertions(+), 21 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 00c2683..a139a41 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -430,6 +430,10 @@
'default' => false, // T69651
],
+ 'wmgUseWikidataBuild' => [
+ 'default' => true,
+ ],
+
'wmgUseArticlePlaceholder' => [
'default' => false,
'wikidataclient' => true,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cd59a11..abccb86 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18010,6 +18010,10 @@
'wikidata' => true,
],
+'wmgUseWikidataBuild' => [
+ 'default' => true,
+],
+
'wmgUseWikibaseRepo' => [
'default' => false,
'wikidata' => true,
diff --git a/wmf-config/Wikibase-buildentry.php
b/wmf-config/Wikibase-buildentry.php
index 98c759e..11f740b 100644
--- a/wmf-config/Wikibase-buildentry.php
+++ b/wmf-config/Wikibase-buildentry.php
@@ -7,26 +7,46 @@
$wgWikidataBuildBaseDir = $IP . '/extensions/Wikidata';
-if ( file_exists( $wgWikidataBuildBaseDir . '/vendor/autoload.php' ) ) {
- include_once $wgWikidataBuildBaseDir . '/vendor/autoload.php';
-}
-
-if ( !empty( $wmgUseWikibaseRepo ) ) {
- include_once
"$wgWikidataBuildBaseDir/extensions/Wikibase/repo/Wikibase.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/Wikidata.org/WikidataOrg.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/PropertySuggester/PropertySuggester.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/Quality/WikibaseQuality.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
-}
-
-if ( !empty( $wmgUseWikibaseClient ) ) {
- include_once
"$wgWikidataBuildBaseDir/extensions/Wikibase/client/WikibaseClient.php";
- wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBuildBaseDir/extensions/WikimediaBadges/extension.json" );
- if ( !empty( $wmgUseArticlePlaceholder ) ) {
- wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBuildBaseDir/extensions/ArticlePlaceholder/extension.json" );
+if ( $wmgUseWikidataBuild === false ) {
+ if ( !empty( $wmgUseWikibaseRepo ) ) {
+ include_once "$IP/extensions/Wikibase/repo/Wikibase.php";
+ include_once "$IP/extensions/Wikidata.org/WikidataOrg.php";
+ include_once
"$IP/extensions/PropertySuggester/PropertySuggester.php";
+ include_once
"$IP/extensions/WikibaseQuality/WikibaseQuality.php";
+ include_once
"$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php";
}
-}
-// This should be kept until the Wikidata build extension is actually turned
off
-// so that we can keep track of the version deployed on Special:Version
-require_once "$wgWikidataBuildBaseDir/Wikidata.credits.php";
+ if ( !empty( $wmgUseWikibaseClient ) ) {
+ include_once
"$IP/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges' );
+ if ( !empty( $wmgUseArticlePlaceholder ) ) {
+ wfLoadExtension( 'ArticlePlaceholder' );
+ }
+ }
+
+} else {
+ if ( file_exists( $wgWikidataBuildBaseDir . '/vendor/autoload.php' ) ) {
+ include_once $wgWikidataBuildBaseDir . '/vendor/autoload.php';
+ }
+
+ if ( !empty( $wmgUseWikibaseRepo ) ) {
+ include_once
"$wgWikidataBuildBaseDir/extensions/Wikibase/repo/Wikibase.php";
+ include_once
"$wgWikidataBuildBaseDir/extensions/Wikidata.org/WikidataOrg.php";
+ include_once
"$wgWikidataBuildBaseDir/extensions/PropertySuggester/PropertySuggester.php";
+ include_once
"$wgWikidataBuildBaseDir/extensions/Quality/WikibaseQuality.php";
+ include_once
"$wgWikidataBuildBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
+ }
+
+ if ( !empty( $wmgUseWikibaseClient ) ) {
+ include_once
"$wgWikidataBuildBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBuildBaseDir/extensions/WikimediaBadges/extension.json" );
+ if ( !empty( $wmgUseArticlePlaceholder ) ) {
+ wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBuildBaseDir/extensions/ArticlePlaceholder/extension.json" );
+ }
+ }
+
+ // This should be kept until the Wikidata build extension is actually
turned off
+ // so that we can keep track of the version deployed on Special:Version
+ require_once "$wgWikidataBuildBaseDir/Wikidata.credits.php";
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/394401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f21767339d1ff36375a93ab7aa383414ec32117
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
