jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364698 )
Change subject: Remove external validation from the build
......................................................................
Remove external validation from the build
Change-Id: I1535e8b1f893b590d98797780dd742091f97ddbe
---
M Wikidata.php
M build/tasks/updatecomposer.js
M composer.json
3 files changed, 0 insertions(+), 18 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikidata.php b/Wikidata.php
index 30e4e67..04738dd 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -8,7 +8,6 @@
$wmgUseWikibaseRepo = true;
$wmgUseWikibaseClient = true;
$wmgUseWikibaseQuality = true;
- $wmgUseWikibaseQualityExternalValidation = true;
$wmgUseWikibaseMediaInfo = true;
$wmgUseArticlePlaceholder = true;
}
@@ -33,17 +32,6 @@
if ( !empty( $wmgUseWikibaseQuality ) ) {
include_once
"$wgWikidataBaseDir/extensions/Quality/WikibaseQuality.php";
include_once
"$wgWikidataBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
-
- // @note wikibase/external-validation is removed from
composer.json for
- // deployment builds, during the 'branch' grunt command.
(pending security review)
- // jenkins builds for deployment branches have this set to
true, but then we remove
- // the code, so need to check the extension is there even on
jenkins.
- if (
- !empty( $wmgUseWikibaseQualityExternalValidation )
- && is_readable(
"$wgWikidataBaseDir/extensions/ExternalValidation/WikibaseQualityExternalValidation.php"
)
- ) {
- include_once
"$wgWikidataBaseDir/extensions/ExternalValidation/WikibaseQualityExternalValidation.php";
- }
}
// @note wikibase/media-info is removed from composer.json for
diff --git a/build/tasks/updatecomposer.js b/build/tasks/updatecomposer.js
index 80d05cc..6bb2ee0 100644
--- a/build/tasks/updatecomposer.js
+++ b/build/tasks/updatecomposer.js
@@ -18,7 +18,6 @@
composer.require["wikibase/wikibase"] = 'dev-' + branch;
// Don't include in deployment builds while security review is
pending.
- delete composer.require["wikibase/external-validation"];
delete composer.require["wikibase/media-info"];
composer.config["autoloader-suffix"] = autoloadSuffix( branch );
diff --git a/composer.json b/composer.json
index 20dc3de..a3d6f87 100644
--- a/composer.json
+++ b/composer.json
@@ -25,10 +25,6 @@
},
{
"type": "git",
- "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation";
- },
- {
- "type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";
}
],
@@ -41,7 +37,6 @@
"wikibase/Wikidata.org": "dev-master",
"wikibase/quality": "dev-master",
"wikibase/constraints": "dev-master",
- "wikibase/external-validation": "dev-master",
"wikibase/media-info": "dev-master"
},
"require-dev": {
--
To view, visit https://gerrit.wikimedia.org/r/364698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1535e8b1f893b590d98797780dd742091f97ddbe
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/build-resources
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
