From 30834be3a8660cd620184230751d753c9fb647a6 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 3 Aug 2016 14:30:36 -0400 Subject: [PATCH] Attempt hhvm testing on gitlab ci, adjust acceptable failures on travis --- .gitlab-ci.yml | 27 +++++++++++++++++++-------- .travis.yml | 1 + 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5609409c..0bea8b39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,3 @@ -before_script: - # Install dependencies - - bash build/docker_install.sh > /dev/null - # Install composer dependencies - - curl -sS https://getcomposer.org/installer | php - - php composer.phar install --no-dev - # Composer stores all downloaded packages in the vendor/ directory. # Do not use the following if the vendor/ directory is commited to # your git repository. @@ -16,11 +9,29 @@ services: - redis:latest test:5.6: + before_script: + - bash build/docker_install.sh > /dev/null + - curl -sS https://getcomposer.org/installer | php + - php composer.phar install --no-dev image: php:5.6 script: - phpunit -c build test:7: + before_script: + - bash build/docker_install.sh > /dev/null + - curl -sS https://getcomposer.org/installer | php + - php composer.phar install --no-dev image: php:7 script: - - phpunit -c build \ No newline at end of file + - phpunit -c build + +test:hhvm: + before_script: + - curl -sS https://getcomposer.org/installer | hhvm + - hhvm composer.phar install --no-dev + - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar + - chmod +x /usr/local/bin/phpunit + image: diegomarangoni/hhvm:cli + script: + - hhvm `which phpunit` -c build \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index cf72aec6..8de0e34a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ after_script: matrix: allow_failures: + - php: 5.5 - php: nightly - php: hhvm