Soeren.oldag has submitted this change and it was merged. Change subject: Make travis work again (hopefully). ......................................................................
Make travis work again (hopefully). Change-Id: I9627a32ea190f98d9927edccc7d223b4d0844d8f --- M build/travis/after_script.sh M build/travis/before_script.sh M composer.json 3 files changed, 40 insertions(+), 18 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh index 9a3084f..1fb6b07 100644 --- a/build/travis/after_script.sh +++ b/build/travis/after_script.sh @@ -1,6 +1,5 @@ #! /bin/bash -cd ../wiki/extensions/WikibaseQualityExternalValidation -composer remove "wikibase/quality" -composer remove "wikibase/wikibase" +cd ../wiki/extensions//WikibaseQualityExternalValidation + 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 35b9f17..4b6b35e 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -1,3 +1,5 @@ +#! /bin/bash + set -x originalDirectory=$(pwd) @@ -12,6 +14,18 @@ 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 + +# checkout WikibaseQuality +wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz +tar -zxf v1.tar.gz +rm v1.tar.gz +mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikibaseQuality + cd wiki if [ $DBTYPE == "mysql" ] @@ -19,22 +33,36 @@ mysql -e 'CREATE DATABASE its_a_mw;' fi -composer install +composer install --no-dev php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin -cd extensions +cd extensions/WikibaseQuality +composer install --dev --no-interaction --prefer-source + +cd .. + cp -r $originalDirectory WikibaseQualityExternalValidation + cd WikibaseQualityExternalValidation -composer install +composer install --prefer-source + +cd ../Wikibase +composer install --prefer-source 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 "putenv( 'MW_INSTALL_PATH=$(pwd)' );" >> LocalSettings.php +echo '$wgLanguageCode = "en";' >> LocalSettings.php -echo "require_once( __DIR__ . '/extensions/WikibaseQualityExternalValidation/vendor/autoload.php' );" >> LocalSettings.php -echo "require_once( __DIR__ . '/extensions/WikibaseQualityExternalValidation/extensions/Wikibase/repo/ExampleSettings.php' );" >> 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/WikibaseQuality/WikibaseQuality.php";' >> LocalSettings.php +echo 'require_once __DIR__ . "/extensions/WikibaseQualityExternalValidation/WikibaseQualityExternalValidation.php";' >> LocalSettings.php +echo '$wgWBClientSettings["siteGlobalID"] = "enwiki";' >> LocalSettings.php -php maintenance/update.php --quick \ No newline at end of file +php maintenance/update.php --quick diff --git a/composer.json b/composer.json index ae92f75..f951eb7 100755 --- a/composer.json +++ b/composer.json @@ -22,11 +22,9 @@ "require": { "php": ">=5.3.0", "composer/installers": "1.*,>=1.0.1", - "wikibase/wikibase": "dev-master", - "wikibase/data-model": "~2.6", + "wikibase/data-model": "~3.0", "wikibase/data-model-serialization": "~1.3", - "serialization/serialization": "3.*,>=3.2.1", - "wikibase/quality": "1.x-dev" + "serialization/serialization": "3.*,>=3.2.1" }, "require-dev": { "phpunit/phpunit": "~4.5", @@ -42,9 +40,6 @@ "classmap": [ "WikibaseQualityExternalValidationHooks.php", "maintenance/UpdateTable.php" - ], - "files": [ - "WikibaseQualityExternalValidation.php" ] } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/218863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9627a32ea190f98d9927edccc7d223b4d0844d8f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag <[email protected]> Gerrit-Reviewer: Soeren.oldag <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
