jenkins-bot has submitted this change and it was merged.
Change subject: Fix Wikidata.php entry point for jenkins
......................................................................
Fix Wikidata.php entry point for jenkins
Bug: T110518
Change-Id: I4981310bb9302368f7730bdf29df92db5a995d5c
---
M Wikidata.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Aude: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
Addshore: Looks good to me, but someone else must approve
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Wikidata.php b/Wikidata.php
index 1179742..74cb2a8 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -4,8 +4,8 @@
}
// Jenkins stuff part1
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ),
'mwext-Wikidata-testextension' ) !== false ) {
- // in future, run as non-experimental
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
+// in future, run as non-experimental
if ( !defined( 'WB_EXPERIMENTAL_FEATURES' ) ||
!WB_EXPERIMENTAL_FEATURES ) {
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
@@ -72,7 +72,7 @@
);
// Jenkins stuff part2
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ),
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
//Jenkins always loads both so no need to check if they are loaded
before getting settings
require_once __DIR__ . '/extensions/Wikibase/repo/ExampleSettings.php';
require_once __DIR__ .
'/extensions/Wikibase/client/ExampleSettings.php';
--
To view, visit https://gerrit.wikimedia.org/r/234493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4981310bb9302368f7730bdf29df92db5a995d5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf20
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
