aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-10 15:01:42 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-10 15:01:42 +0200
commitde743e35d0aaf76c7987264d299eb159e16c23e5 (patch)
treeeb3fab8307a23489a0b59449b031d11c2b4bf2e8
parent09a46d0c740b87d28cdea03daca4e453ff82add3 (diff)
downloadvolse-hubzilla-de743e35d0aaf76c7987264d299eb159e16c23e5.tar.gz
volse-hubzilla-de743e35d0aaf76c7987264d299eb159e16c23e5.tar.bz2
volse-hubzilla-de743e35d0aaf76c7987264d299eb159e16c23e5.zip
add php-gd and use php7 image
-rw-r--r--.gitlab-ci.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed0ace991..a46ee4775 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
# Select image from https://hub.docker.com/_/php/
-image: php:5.6
+image: php:7
# Select what we should cache
cache:
@@ -10,6 +10,7 @@ before_script:
# Install git, the php image doesn't have installed
- apt-get update -yqq
- apt-get install git -yqq
+- apt-get install php-gd -yqq
# Install mysql driver
- docker-php-ext-install pdo_mysql
@@ -33,10 +34,4 @@ test:mysql:
script:
- vendor/bin/phpunit --configuration phpunit_mysql.xml --coverage-text
-# We test PHP7 with MySQL, but we allow it to fail
-test:php7:mysql:
- image: php:7
- script:
- - vendor/bin/phpunit --configuration phpunit_mysql.xml --coverage-text
- allow_failure: true