From 3e4e76cf0f96dc22922b3583967a3a6706a65ed9 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 15 Feb 2017 10:23:07 -0500 Subject: [PATCH] Try, try again --- .gitlab-ci.yml | 4 ++-- build/docker_install.sh | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc25856f..f515ebaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ test:7: - php composer.phar install --no-dev --ignore-platform-reqs image: php:7-alpine script: - - ./vendor/bin/phpunit -c build --coverage-text --colors=never + - phpunit -c build --coverage-text --colors=never test:7.1: stage: test @@ -20,7 +20,7 @@ test:7.1: - php composer.phar install --no-dev --ignore-platform-reqs image: php:7.1-alpine script: - - ./vendor/bin/phpunit -c build --coverage-text --colors=never + - phpunit -c build --coverage-text --colors=never #test:hhvm: # stage: test diff --git a/build/docker_install.sh b/build/docker_install.sh index 4cd9bd1a..58ada2f8 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -11,8 +11,11 @@ apk upgrade --update && apk add --no-cache \ make \ autoconf \ curl \ - git \ - zlib-dev + git + +# Install phpunit, the tool that we will use for testing +curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar +chmod +x /usr/local/bin/phpunit # Install extensions # Install xdebug for coverage report @@ -20,4 +23,3 @@ docker-php-source extract pecl install xdebug docker-php-ext-enable xdebug docker-php-source delete -# docker-php-ext-install zip \ No newline at end of file