Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232328
Change subject: Travis: Make testing fail on installation errors; improve
composer usage
......................................................................
Travis: Make testing fail on installation errors; improve composer usage
Change-Id: Id653cd95f2e452724e01733c387061894bba53cd
---
M build/travis/script.sh
1 file changed, 13 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon
refs/changes/28/232328/1
diff --git a/build/travis/script.sh b/build/travis/script.sh
index 199c19b..7c5aa07 100644
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -3,7 +3,7 @@
#####
# This file is part of the MediaWiki skin Chameleon.
#
-# @copyright 2013 - 2014, Stephan Gambke, mwjames
+# @copyright 2013 - 2015, Stephan Gambke, mwjames
# @license GNU General Public License, version 3 (or any later version)
#
# The Chameleon skin is free software: you can redistribute it and/or modify
@@ -24,7 +24,10 @@
# @ingroup Skins
#####
-set -x
+set -x # display commands and their expanded arguments
+set -u # treat unset variables as an error when performing parameter expansion
+set -o pipefail # pipelines exit with last (rightmost) non-zero exit code
+set -e # exit immediately if a command exits with an error
originalDirectory=$(pwd)
@@ -50,8 +53,8 @@
cd mw
- ## MW 1.25 requires Psr\Logger
- if [ "$MW" == "master" ]
+ ## MW 1.25+ installs packages using composer
+ if [ -f composer.json ]
then
composer install
fi
@@ -62,7 +65,10 @@
function installSkinViaComposerOnMediaWikiRoot {
- composer init
+ if [ ! -f composer.json ]
+ then
+ composer init
+ fi
composer require 'phpunit/phpunit=~4.0' --prefer-source
composer require 'mediawiki/chameleon-skin=@dev' --prefer-source
@@ -101,6 +107,8 @@
php ocular.phar code-coverage:upload
--repository='g/wikimedia/mediawiki-skins-chameleon' --format=php-clover
coverage.clover
}
+composer self-update
+
installMediaWiki
installSkinViaComposerOnMediaWikiRoot
--
To view, visit https://gerrit.wikimedia.org/r/232328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id653cd95f2e452724e01733c387061894bba53cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
