Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232371
Change subject: Travis: Fix phpunit version (2); update .travis.yml
......................................................................
Travis: Fix phpunit version (2); update .travis.yml
Change-Id: Ic66875732cb55f9186017eb5b38723f2a437f5ad
---
M .travis.yml
M build/travis/script.sh
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon
refs/changes/71/232371/1
diff --git a/.travis.yml b/.travis.yml
index 1f99c0a..e28512e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,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
@@ -25,6 +25,7 @@
#####
language: php
+sudo: false
env:
- THENEEDFORTHIS=FAIL
diff --git a/build/travis/script.sh b/build/travis/script.sh
index e81f898..11ced2c 100644
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -70,7 +70,7 @@
composer init
fi
- composer remove --dev 'phpunit/phpunit'
+ composer remove --dev --update-with-dependencies 'phpunit/phpunit'
composer require 'phpunit/phpunit=~4.0' 'mediawiki/chameleon-skin=@dev'
--prefer-source
cd skins
--
To view, visit https://gerrit.wikimedia.org/r/232371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic66875732cb55f9186017eb5b38723f2a437f5ad
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
