Merge pull request #429 from hannesvdvreken/patch-1

Baachi · Baachi · commit 84ecb9ef1d1f · 2015-05-04T10:26:50.000+02:00
Revert #309
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,8 @@ php:
     - 5.4
     - 5.5
     - 5.6
-    - nightly
-    - hhvm-nightly
+    - 7.0
+    - hhvm
 
 matrix:
     fast_finish: true
@@ -25,7 +25,7 @@ matrix:
           env: deps="low"
 
 before_script:
-    - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then pecl install geoip; fi
+    - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then pecl install geoip; fi
     - composer self-update
     - if [ "$deps" = "low" ]; then composer update --prefer-dist --prefer-lowest; fi
     - if [ "$deps" = "" ]; then composer install --prefer-dist --no-interaction; fi
