From 85a6fafd4f4739e6828e470e665552baa512c9fb Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 15 Feb 2017 09:36:51 -0500 Subject: [PATCH] Make sure to try to install the correct packages --- .gitlab-ci.yml | 24 ++++++++++++------------ build/docker_install.sh | 6 ++---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65415e8b..87eeedc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,15 +29,15 @@ test:7.1: script: - phpunit -c build --coverage-text --colors=never -test:hhvm: - stage: test - allow_failure: true - before_script: - - /usr/local/bin/composer self-update - - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar - - chmod +x /usr/local/bin/phpunit - - composer install --no-dev --ignore-platform-reqs - #image: 51systems/docker-gitlab-ci-runner-hhvm - image: 2ndkauboy/gitlab-ci-runner-hhvm - script: - - hhvm -d hhvm.php7.all=true /usr/local/bin/phpunit -c build --coverage-text --colors=never \ No newline at end of file +#test:hhvm: +# stage: test +# allow_failure: true +# before_script: +# - /usr/local/bin/composer self-update +# - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar +# - chmod +x /usr/local/bin/phpunit +# - composer install --no-dev --ignore-platform-reqs +# #image: 51systems/docker-gitlab-ci-runner-hhvm +# image: 2ndkauboy/gitlab-ci-runner-hhvm +# script: +# - hhvm -d hhvm.php7.all=true /usr/local/bin/phpunit -c build --coverage-text --colors=never \ No newline at end of file diff --git a/build/docker_install.sh b/build/docker_install.sh index d205f29d..d44cc683 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -9,10 +9,8 @@ set -xe apk upgrade --update && apk add \ curl \ git \ - libxslt1-dev \ - libxslt1.1 \ - zlib1g-dev \ - unzip + libxslt-dev \ + zlib-dev # Install phpunit, the tool that we will use for testing curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar