Skip to content

Commit f2f5b7b

Browse files
committed
Merge pull request #374 from xabbuh/travis-hhvm
fix HHVM builds on Travis
2 parents 7d06352 + 5e05de6 commit f2f5b7b

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ php:
66
- 5.6
77
- hhvm-nightly
88

9-
matrix:
10-
allow_failures:
11-
- php: hhvm-nightly
12-
139
before_script:
14-
- sudo apt-get install -y --force-yes libgeoip-dev
15-
- pecl install geoip
10+
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then sudo apt-get install -y --force-yes libgeoip-dev; fi'
11+
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then pecl install geoip; fi'
1612
- composer self-update
1713
- composer install --dev --prefer-dist --no-interaction
1814

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
},
1919
"require-dev": {
2020
"geoip2/geoip2": "~0.6",
21-
"symfony/stopwatch": "~2.5",
22-
"ext-geoip": "*"
21+
"symfony/stopwatch": "~2.5"
2322
},
2423
"suggest": {
2524
"ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",

0 commit comments

Comments
 (0)