From ed13df885b3f86420533fc80905a0fa454fa5aad Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 15 Feb 2017 10:05:06 -0500 Subject: [PATCH] Ignore stupid xsl requirement --- .gitlab-ci.yml | 4 ++-- build/docker_install.sh | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87eeedc3..4e6c2ebe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ test:7: before_script: - sh build/docker_install.sh > /dev/null - curl -sS https://getcomposer.org/installer | php - - php composer.phar install --no-dev + - php composer.phar install --no-dev --ignore-platform-reqs image: php:7-alpine script: - phpunit -c build --coverage-text --colors=never @@ -24,7 +24,7 @@ test:7.1: before_script: - sh build/docker_install.sh > /dev/null - curl -sS https://getcomposer.org/installer | php - - php composer.phar install --no-dev + - php composer.phar install --no-dev --ignore-platform-reqs image: php:7.1-alpine script: - phpunit -c build --coverage-text --colors=never diff --git a/build/docker_install.sh b/build/docker_install.sh index 83344ee0..abcd62bd 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -15,16 +15,14 @@ apk upgrade --update && apk add --no-cache \ 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 +#chmod +x /usr/local/bin/phpunit + +# Install extensions # Install xdebug for coverage report docker-php-source extract pecl install xdebug docker-php-ext-enable xdebug docker-php-source delete - -# 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 -docker-php-ext-install xsl docker-php-ext-install zip \ No newline at end of file