Foxtrott has submitted this change and it was merged.

Change subject: Fix Travis for MW 1.25
......................................................................


Fix Travis for MW 1.25

Change-Id: I8eb3fe3185d86ea05d201c5cccbd0cf8e67fde34
---
M build/travis/before_script.sh
1 file changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Foxtrott: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 0cbfb57..d78e633 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -7,11 +7,17 @@
 function installMediaWiki {
        cd ..
 
-       wget https://github.com/wikimedia/mediawiki-core/archive/$MW.tar.gz
+       wget https://github.com/wikimedia/mediawiki/archive/$MW.tar.gz
        tar -zxf $MW.tar.gz
-       mv mediawiki-core-$MW phase3
+       mv mediawiki-$MW phase3
 
        cd phase3
+
+       ## MW 1.25 requires Psr\Logger
+       if [ "$MW" == "master" ]
+       then
+         composer install
+       fi
 
        mysql -e 'create database its_a_mw;'
        php maintenance/install.php --dbtype $DB --dbuser root --dbname 
its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin
@@ -22,7 +28,7 @@
        # dev is only needed for as long no stable release is available
        composer init --stability dev
 
-       composer require 'phpunit/phpunit=3.7.*' --prefer-source
+       composer require 'phpunit/phpunit=3.7.*' --prefer-source 
--update-with-dependencies
        composer require 'mediawiki/semantic-glossary=@dev' --prefer-source
 
        cd extensions

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb3fe3185d86ea05d201c5cccbd0cf8e67fde34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticGlossary
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>
Gerrit-Reviewer: Foxtrott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to