From 8b8ece3dad0efb98223de027e5d5d861e7e2ba82 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 6 Dec 2017 11:07:23 -0500 Subject: [PATCH] Attempt to fix gitlab ci build --- .gitlab-ci.yml | 11 ----------- build/docker_install.sh | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ffbec17..c1f44a8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,14 +19,3 @@ test:7.1: image: php:7.1-cli-alpine3.4 script: - phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never - -test:7.2: - stage: test - 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 install --ignore-platform-reqs - image: php:7.2-cli-alpine3.4 - script: - - phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never diff --git a/build/docker_install.sh b/build/docker_install.sh index 5dab2200..9ff71dc5 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -9,4 +9,5 @@ set -xe 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 \ curl \ - git + git \ + ipv6