Soeren.oldag has submitted this change and it was merged.

Change subject: Adopted travis configuration.
......................................................................


Adopted travis configuration.

Change-Id: I08024aead1a6086bb8527ec1a6029ef0e7ffd018
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M build/travis/script.sh
3 files changed, 11 insertions(+), 43 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 4f975c4..0b6c27b 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-cd ../wiki/extensions/WikidataQuality/extensions/WikidataQualityConstraints
+cd ../wiki/extensions/WikibaseQualityConstraints
 
 ls build/logs
 
-php vendor/bin/coveralls -v
+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 fcfcfdf..3adf120 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,5 +1,3 @@
-#! /bin/bash
-
 set -x
 
 originalDirectory=$(pwd)
@@ -14,18 +12,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
-
-# checkout WikidataQuality
-wget 
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz
-tar -zxf master.tar.gz
-rm master.tar.gz
-mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikidataQuality
-
 cd wiki
 
 if [ $DBTYPE == "mysql" ]
@@ -33,37 +19,22 @@
     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/WikidataQuality
-composer install --dev --no-interaction --prefer-source
-
-mkdir extensions
 cd extensions
-
-cp -r $originalDirectory WikidataQualityConstraints
-
-cd WikidataQualityConstraints
-composer install --prefer-source
-
-cd ../../../Wikibase
-composer install --prefer-source
+cp -r $originalDirectory WikibaseQualityConstraints
+cd WikibaseQualityConstraints
+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 "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 'require_once __DIR__ . 
"/extensions/WikidataQuality/extensions/WikidataQualityConstraints/WikidataQualityConstraints.php";'
 >> LocalSettings.php
-echo '$wgWBClientSettings["siteGlobalID"] = "enwiki";' >> LocalSettings.php
+echo "require_once( __DIR__ . 
'/extensions/WikibaseQualityConstraints/vendor/autoload.php' );" >> 
LocalSettings.php
+echo "require_once( __DIR__ . 
'/extensions/WikibaseQualityConstraints/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/script.sh b/build/travis/script.sh
index bb88fbd..77a59eb 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/extensions/WikidataQualityConstraints/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/WikibaseQualityConstraints/phpunit.xml.dist
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/209448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I08024aead1a6086bb8527ec1a6029ef0e7ffd018
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag <soeren_ol...@freenet.de>
Gerrit-Reviewer: Soeren.oldag <soeren_ol...@freenet.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to