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

Change subject: Make travis work again (hopefully).
......................................................................


Make travis work again (hopefully).

Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be
---
M build/travis/after_script.sh
M build/travis/before_script.sh
M composer.json
3 files changed, 24 insertions(+), 9 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 29ac374..8acb827 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
 
 cd ../wiki/extensions/WikibaseQuality
-composer remove "wikibase/wikibase"
+
 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 d867cda..f55a7d8 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,12 @@
 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" ]
@@ -19,22 +27,32 @@
     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
+
 cp -r $originalDirectory WikibaseQuality
+
 cd WikibaseQuality
-composer install
+composer install --dev --no-interaction --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/WikibaseQuality/vendor/autoload.php' );" >> LocalSettings.php
-echo "require_once( __DIR__ . 
'/extensions/WikibaseQuality/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 '$wgWBClientSettings["siteGlobalID"] = "enwiki";' >> LocalSettings.php
 
 php maintenance/update.php --quick
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 699cd8d..c1b91e2 100755
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,6 @@
                },
                "classmap": [
                        "WikibaseQualityHooks.php"
-               ],
-               "files": [
-                       "WikibaseQuality.php"
                ]
        }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia35b7512da2ff6035f2e793eca1d2b95a3b846be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag <[email protected]>
Gerrit-Reviewer: Soeren.oldag <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to