Skip to content

Commit

Permalink
Update environment.
Browse files Browse the repository at this point in the history
  • Loading branch information
fpoirotte committed Apr 5, 2014
1 parent d5a9885 commit 7959da4
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 47 deletions.
9 changes: 9 additions & 0 deletions .travis.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

export DEBIAN_FRONTEND=noninteractive
apt-get remove -qq hhvm
add-apt-repository -y ppa:mapnik/boost
wget -O- http://dl.hhvm.com/conf/hhvm.gpg.key | apt-key add -
echo deb http://dl.hhvm.com/ubuntu precise main | tee /etc/apt/sources.list.d/hhvm.list
apt-get update -q
apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" hhvm-nightly
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,19 @@ php:
- 5.6
- hhvm

matrix:
allow_failures:
- php: hhvm

notifications:
email: false
irc: "irc.iiens.net#Erebot"

before_script:
- if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]; then sudo "$TRAVIS_BUILD_DIR/.travis.sh"; fi
- composer self-update -n
- composer install --dev -n

script:
- phpunit --coverage-clover clover.xml --bootstrap vendor/erebot/testenv/bootstrap.php tests/
- phpunit --coverage-clover clover.xml --bootstrap tests/bootstrap.php tests/

after_script:
- composer require --dev $prefer_source "satooshi/php-coveralls dev-master"
- composer require --dev "satooshi/php-coveralls dev-master"
- php vendor/bin/coveralls -n -v

80 changes: 40 additions & 40 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<phpunit forceCoversAnnotation="true" bootstrap="tests/bootstrap.php">
<phpunit bootstrap="tests/bootstrap.php">
<testsuites>
<testsuite name="Erebot/Module/AutoConnect">
<directory>tests/</directory>
Expand Down

0 comments on commit 7959da4

Please sign in to comment.