Soeren.oldag has submitted this change and it was merged. Change subject: Next try for running travis. ......................................................................
Next try for running travis. Change-Id: Ib3c21dbe3bd1dc990d9faf143325f615e4d1cd36 --- M WikidataQuality.php M build/travis/after_script.sh M build/travis/before_script.sh D build/travis/composer.local.json M build/travis/script.sh M composer.json 6 files changed, 15 insertions(+), 37 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/WikidataQuality.php b/WikidataQuality.php index bec172e..c7a3fa8 100644 --- a/WikidataQuality.php +++ b/WikidataQuality.php @@ -8,11 +8,6 @@ exit( 1 ); } -// Enable autoload -if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) { - require_once __DIR__ . '/vendor/autoload.php'; -} - call_user_func( function() { // Set credits $GLOBALS['wgExtensionCredits']['specialpage'][] = array ( diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index ae2368b..f297d5a 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,7 +1,7 @@ #! /bin/bash -cd ../wiki -wikiDirectory=$(pwd) +cd ../wiki/extensions/WikibaseQuality -cd extensions/Quality -php $wikiDirectory/vendor/bin/coveralls -v \ No newline at end of file +ls build/logs + +php vendor/bin/coveralls -v \ No newline at end of file diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index 5545fb0..d867cda 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -1,9 +1,6 @@ -#! /bin/bash - set -x originalDirectory=$(pwd) -rm -rf .git/shallow composer self-update @@ -23,21 +20,21 @@ fi composer install - php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin -cp $originalDirectory/build/travis/composer.local.json composer.local.json -sed -i.bak "s:\$originalDirectory:$originalDirectory:g" composer.local.json -composer update +cd extensions +cp -r $originalDirectory WikibaseQuality +cd WikibaseQuality +composer install +cd ../.. echo 'error_reporting(E_ALL| E_STRICT);' >> LocalSettings.php echo 'ini_set("display_errors", 1);' >> LocalSettings.php echo '$wgShowExceptionDetails = true;' >> LocalSettings.php echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php -echo '$wgLanguageCode = "en";' >> LocalSettings.php +echo "putenv( 'MW_INSTALL_PATH=$(pwd)' );" >> LocalSettings.php -echo '$wgEnableWikibaseRepo = true;' >> LocalSettings.php -echo '$wgEnableWikibaseClient = false;' >> LocalSettings.php -echo 'require_once "$IP/extensions/Wikibase/repo/ExampleSettings.php";' >> LocalSettings.php +echo "require_once( __DIR__ . '/extensions/WikibaseQuality/vendor/autoload.php' );" >> LocalSettings.php +echo "require_once( __DIR__ . '/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' );" >> LocalSettings.php php maintenance/update.php --quick \ No newline at end of file diff --git a/build/travis/composer.local.json b/build/travis/composer.local.json deleted file mode 100644 index fd937ca..0000000 --- a/build/travis/composer.local.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "repositories": [ - { - "type": "git", - "url": "$originalDirectory" - } - ], - "require": { - "wikibase/quality": "master-dev", - "wikibase/wikibase": "@dev" - }, - "require-dev": { - "satooshi/php-coveralls": "master-dev" - } -} \ No newline at end of file diff --git a/build/travis/script.sh b/build/travis/script.sh index ee3b220..b37ec05 100644 --- a/build/travis/script.sh +++ b/build/travis/script.sh @@ -3,4 +3,4 @@ set -x cd ../wiki/tests/phpunit -php phpunit.php -c ../../extensions/Quality/phpunit.xml.dist \ No newline at end of file +php phpunit.php -c ../../extensions/WikibaseQuality/phpunit.xml.dist \ No newline at end of file diff --git a/composer.json b/composer.json index bd7fe8e..d8525cf 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "serialization/serialization": "3.*,>=3.2.1" }, "require-dev": { - "phpunit/phpunit": "~4.5" + "phpunit/phpunit": "~4.5", + "satooshi/php-coveralls": "master-dev" }, "autoload": { "psr-4": { -- To view, visit https://gerrit.wikimedia.org/r/209227 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3c21dbe3bd1dc990d9faf143325f615e4d1cd36 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag <soeren_ol...@freenet.de> Gerrit-Reviewer: Soeren.oldag <soeren_ol...@freenet.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits