From 5ff1c7563fb95ac5dba15560e4ad13abba0a77ad Mon Sep 17 00:00:00 2001
From: Fred Emmott <fe@fb.com>
Date: Tue, 12 Feb 2019 16:09:34 -0800
Subject: [PATCH] test on Travis

---
 .travis.sh  | 17 ++++++++++++++---
 .travis.yml | 12 ++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index fb7cd65..dc81c81 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,10 +1,21 @@
 #!/bin/sh
 set -ex
+apt update -y
+DEBIAN_FRONTEND=noninteractive apt install -y php-cli zip unzip
 hhvm --version
+php --version
 
-wget https://getcomposer.org/composer.phar
-hhvm ./composer.phar install --ignore-platform-reqs
+(
+  cd $(mktemp -d)
+  curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+)
+composer install
 
 hh_client
+# no run-time tests for this as it's just interfaces
+# hhvm vendor/bin/hacktest tests/
 
-hhvm vendor/bin/hhast-lint
+# ... but we probably should enable lint
+#if !(hhvm --version | grep -q -- -dev); then
+#  hhvm vendor/bin/hhast-lint
+#fi
diff --git a/.travis.yml b/.travis.yml
index 595f035..b7ae2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
-language: php
-php:
- - hhvm
+sudo: required
+language: generic
+services: docker
+env:
+ - HHVM_VERSION=latest
+install:
+ - docker pull hhvm/hhvm:$HHVM_VERSION
 script:
- - ./.travis.sh
+ - docker run --rm -w /var/source -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION ./.travis.sh