From eaca5d9b44637e0af5cb54fccca43442c145c51c Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 28 Feb 2017 09:39:43 -0500 Subject: [PATCH] Another go at gitlab ci code coverage --- .gitlab-ci.yml | 2 ++ build/docker_install.sh | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db52a9f..cb0929f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ cache: test:7: before_script: - sh build/docker_install.sh > /dev/null + - apk add --no-cache php7-phpdbg - curl -sS https://getcomposer.org/installer | php - php composer.phar update - php composer.phar install @@ -18,6 +19,7 @@ test:7: test:7.1: before_script: - sh build/docker_install.sh > /dev/null + - apk add --no-cache php7.1-phpdbg - curl -sS https://getcomposer.org/installer | php - php composer.phar update - php composer.phar install diff --git a/build/docker_install.sh b/build/docker_install.sh index c79a781..2c595f1 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -6,17 +6,14 @@ set -xe # Install git (the php image doesn't have it) which is required by composer +echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories apk upgrade --update && apk add --no-cache \ - g++ \ - make \ - autoconf \ curl \ - git \ - phpdbg + 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 +# 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