Soeren.oldag has submitted this change and it was merged. Change subject: Adopted travis scripts to new composer file. ......................................................................
Adopted travis scripts to new composer file. Change-Id: I3e7360e82051469f1b8262530ed3c03049b65b56 --- M build/travis/after_script.sh M build/travis/before_script.sh A build/travis/composer.local.json M build/travis/script.sh M composer.json 5 files changed, 32 insertions(+), 35 deletions(-) Approvals: Soeren.oldag: Checked; Looks good to me, approved diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index 60a8ebe..ae2368b 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,7 +1,7 @@ #! /bin/bash -cd ../wiki/extensions/WikidataQuality +cd ../wiki +wikiDirectory=$(pwd) -ls build/logs - -php vendor/bin/coveralls -v +cd extensions/Quality +php $wikiDirectory/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 4882eb8..5545fb0 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -3,6 +3,7 @@ set -x originalDirectory=$(pwd) +rm -rf .git/shallow composer self-update @@ -14,12 +15,6 @@ rm master.tar.gz mv mediawiki-master wiki -# checkout wikibase -wget https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz -tar -zxf master.tar.gz -rm master.tar.gz -mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase - cd wiki if [ $DBTYPE == "mysql" ] @@ -27,20 +22,13 @@ mysql -e 'CREATE DATABASE its_a_mw;' fi -composer install --no-dev +composer install + php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin -cd extensions - -cp -r $originalDirectory WikidataQuality - -cd WikidataQuality -composer install --dev --no-interaction --prefer-source - -cd ../Wikibase -composer install --prefer-source - -cd ../.. +cp $originalDirectory/build/travis/composer.local.json composer.local.json +sed -i.bak "s:\$originalDirectory:$originalDirectory:g" composer.local.json +composer update echo 'error_reporting(E_ALL| E_STRICT);' >> LocalSettings.php echo 'ini_set("display_errors", 1);' >> LocalSettings.php @@ -48,11 +36,8 @@ echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php echo '$wgLanguageCode = "en";' >> LocalSettings.php -echo "define( 'WB_EXPERIMENTAL_FEATURES', true );" >> LocalSettings.php -echo 'require_once __DIR__ . "/extensions/Wikibase/repo/Wikibase.php";' >> LocalSettings.php -echo 'require_once __DIR__ . "/extensions/Wikibase/repo/ExampleSettings.php";' >> LocalSettings.php -echo 'require_once __DIR__ . "/extensions/Wikibase/client/WikibaseClient.php";' >> LocalSettings.php -echo 'require_once __DIR__ . "/extensions/WikidataQuality/WikidataQuality.php";' >> LocalSettings.php -echo '$wgWBClientSettings["siteGlobalID"] = "enwiki";' >> LocalSettings.php +echo '$wgEnableWikibaseRepo = true;' >> LocalSettings.php +echo '$wgEnableWikibaseClient = false;' >> LocalSettings.php +echo 'require_once "$IP/extensions/Wikibase/repo/ExampleSettings.php";' >> LocalSettings.php -php maintenance/update.php --quick +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 new file mode 100644 index 0000000..fd937ca --- /dev/null +++ b/build/travis/composer.local.json @@ -0,0 +1,15 @@ +{ + "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 4f78065..ee3b220 100644 --- a/build/travis/script.sh +++ b/build/travis/script.sh @@ -3,7 +3,4 @@ set -x cd ../wiki/tests/phpunit -php phpunit.php -c ../../extensions/WikidataQuality/phpunit.xml.dist - -# cd ../wiki/extensions/WikidataQuality -# php vendor/bin/phpunit -c phpunit.xml.dist \ No newline at end of file +php phpunit.php -c ../../extensions/Quality/phpunit.xml.dist \ No newline at end of file diff --git a/composer.json b/composer.json index b047cd7..bd7fe8e 100644 --- a/composer.json +++ b/composer.json @@ -21,12 +21,12 @@ "serialization/serialization": "3.*,>=3.2.1" }, "require-dev": { - "phpunit/phpunit": "~4.5", - "satooshi/php-coveralls": "dev-master" + "phpunit/phpunit": "~4.5" }, "autoload": { "psr-4": { "WikidataQuality\\": "includes/", + "WikidataQuality\\Api\\": "api/", "WikidataQuality\\Specials\\": "specials/", "WikidataQuality\\Tests\\": "tests/phpunit/" }, -- To view, visit https://gerrit.wikimedia.org/r/209196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e7360e82051469f1b8262530ed3c03049b65b56 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag <soeren_ol...@freenet.de> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> 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
