Dont' use docker on travis

Author: fredemmott

.travis.sh

@@ -2,21 +2,12 @@
 set -ex
 hhvm --version
 
-curl https://getcomposer.org/installer | hhvm --php -- /dev/stdin --install-dir=/usr/local/bin --filename=composer
+composer install
 
-cd /var/source
-hhvm /usr/local/bin/composer install
+hh_client
 
-hh_server --check $(pwd)
-sed -i '/enable_experimental_tc_features/d' .hhconfig
-hh_server --check $(pwd)
-
-hhvm -d hhvm.php7.all=0 vendor/bin/phpunit test/
-hhvm -d hhvm.php7.all=1 vendor/bin/phpunit test/
+hhvm vendor/bin/phpunit tests/
 
-hhvm examples/dorm/codegen.php examples/dorm/demo/DormUserSchema.php
-
-HHVM_VERSION=$(hhvm --php -r 'echo HHVM_VERSION_ID;' 2>/dev/null);
-if [ $HHVM_VERSION -ge 32300 -a $HHVM_VERSION -lt 32400 ]; then
-  vendor/bin/hhast-lint
-fi
+echo > .hhconfig
+rm -rf vendor/hhvm/hhast # avoid circular dependency when fixing things
+hh_server --check $(pwd)

.travis.yml

@@ -1,11 +1,7 @@
-sudo: required
-language: generic
-services:
- - docker
-env:
- - HHVM_VERSION=latest
- - HHVM_VERSION=nightly
-install:
- - docker pull hhvm/hhvm:$HHVM_VERSION
+language: php
+php:
+ - hhvm
+ - hhvm-3.24
+ - hhvm-nightly
 script:
- - docker run -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION /var/source/.travis.sh
+ - ./.travis.sh