Skip to content

Commit ce51ca8

Browse files
atdtbd808
authored andcommitted
Update Travis CI build configuration
* Target 'hhvm-nightly', not 'hhvm'. * Don't target Zend PHP versions other than 5.3. There is value in targetting different versions of the PHP interpreter, but in the short term there is more benefit to be had from targetting just HHVM and PHP 5.3 (results are produced more quickly and are easier to interpret). * Don't update submodules manually; Travis does that by default if there is a .gitmodules file in the repository root. <http://docs.travis-ci.com/user/build-configuration/#Git-Submodules> * Update Composer before installing PHPUnit. * Make the wiki name and dbname agree. * Allow Composer to install whatever is specified in composer.json, rather than hard-coding an install of PHPUnit 3.7 (3.7 is incompatible with HHVM). * Ping freenode#mediawiki-core with the test results, but only when the build status changes. We can turn it off if it gets annoying. * Don't hack include_path or date.timezone ini settings; those were kludges needed to get HHVM to run at all at, but they're no longer needed. * Invoke hhvm via 'php'; Travis ensures that it points to the target interpreter. Verified on my personal fork: <https://travis-ci.org/atdt/mediawiki-core/builds/27983653> Change-Id: I442b40e0d3e31d3cbd963e1219578842f4564004
1 parent 109c37f commit ce51ca8

File tree

1 file changed

+13
-29
lines changed

1 file changed

+13
-29
lines changed

.travis.yml

+13-29
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,8 @@
99
language: php
1010

1111
php:
12-
- hhvm
12+
- hhvm-nightly
1313
- 5.3
14-
- 5.4
15-
- 5.5
16-
- 5.6
17-
18-
matrix:
19-
allow_failures:
20-
- php: 5.3
21-
- php: 5.4
22-
- php: 5.5
23-
- php: 5.6
2414

2515
services:
2616
- mysql
@@ -33,31 +23,25 @@ branches:
3323

3424
before_install:
3525
- sudo apt-get install -qq djvulibre-bin tidy
26+
- composer self-update --quiet --no-interaction
3627

3728
before_script:
38-
# Initialise submodules, in case we're testing a Wikimedia production branch.
39-
- git submodule update --init --recursive
40-
# Travis CI's HHVM environment provides PHPUnit as a phar file, but
41-
# MediaWiki's test suite only works if individual PHPUnit files are
42-
# actual files on disk (bug 58881).
43-
- composer require 'phpunit/phpunit=3.7.*' --prefer-source
29+
- composer install --prefer-source --quiet --no-interaction
4430
- >
45-
php maintenance/install.php testwiki admin
31+
php maintenance/install.php traviswiki admin
4632
--pass travis
4733
--dbname traviswiki
4834
--dbuser travis
4935
--dbpass ""
5036
--scriptpath "/w"
5137
5238
script:
53-
- >
54-
if [ "$TRAVIS_PHP_VERSION" = "hhvm" ];
55-
then
56-
hhvm --php \
57-
-d include_path=".$(printf ':%s' vendor/phpunit/*)" \
58-
-d date.timezone="Etc/UTC" \
59-
tests/phpunit/phpunit.php
60-
else
61-
php tests/phpunit/phpunit.php \
62-
--with-phpunitdir ./vendor/phpunit/phpunit
63-
fi
39+
- php tests/phpunit/phpunit.php
40+
41+
notifications:
42+
irc:
43+
channels:
44+
- "chat.freenode.net#mediawiki-core"
45+
on_success: change
46+
on_failure: change
47+
skip_join: true

0 commit comments

Comments
 (0)