Foxtrott has submitted this change and it was merged.

Change subject: Add wfLoadExtension to test install script
......................................................................


Add wfLoadExtension to test install script

Change-Id: I5fd771b64f548a5b0c196dfcdbbaf5326c98b1d8
---
M .travis.yml
M build/travis/script.sh
M composer.json
3 files changed, 8 insertions(+), 9 deletions(-)

Approvals:
  Foxtrott: Verified; Looks good to me, approved



diff --git a/.travis.yml b/.travis.yml
index 6c96c31..c89d7ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,16 +24,16 @@
 #####
 
 language: php
-sudo: false
+#sudo: false
 
 matrix:
   include:
     - env: DBTYPE=mysql; MW=master
       php: 5.6
-    - env: DBTYPE=postgres; MW=master
-      php: 5.4
-    - env: DBTYPE=sqlite; MW=1.25.5
-      php: 5.3
+#    - env: DBTYPE=postgres; MW=master
+#      php: 5.5
+#    - env: DBTYPE=sqlite; MW=1.25.5
+#      php: 5.3
 
 script:
     - bash ./build/travis/script.sh
diff --git a/build/travis/script.sh b/build/travis/script.sh
index 95af129..1ddb087 100755
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -59,11 +59,8 @@
                composer init
        fi
 
-#      composer remove --dev --update-with-dependencies 'phpunit/phpunit'
+       composer remove --dev --update-with-dependencies 'phpunit/phpunit'
        composer require 'phpunit/phpunit=~4.0' 'mediawiki/lingo=@dev' 
--prefer-source
-
-       pwd
-       ls -al
 
        cd extensions/Lingo
 
@@ -89,6 +86,7 @@
        echo '$wgShowExceptionDetails = true;' >> LocalSettings.php
        echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php
        echo "putenv( 'MW_INSTALL_PATH=$(pwd)' );" >> LocalSettings.php
+       echo "wfLoadExtension('Lingo');" >> LocalSettings.php
 
        php maintenance/update.php --quick
 }
diff --git a/composer.json b/composer.json
index 40a3388..cdc8c2a 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
        "require"    : {
                "php"    : ">=5.3.2",
                "ext-dom": "*",
+               "composer/installers": ">1.0.12",
                "justinrainbow/json-schema": "~1.0"
        },
        "suggest": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fd771b64f548a5b0c196dfcdbbaf5326c98b1d8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <s7ep...@gmail.com>
Gerrit-Reviewer: Foxtrott <s7ep...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to