From a2fbe471e3654c3236a7805123b1d45d29dd5763 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Thu, 19 Oct 2017 18:38:56 -0400 Subject: [PATCH] Attempt to fix builds 3 --- .gitlab-ci.yml | 4 ++-- build/docker_install.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8939fe8e..c1f44a8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ test:7: - apk add --no-cache php7-phpdbg - curl -sS https://getcomposer.org/installer | php - php composer.phar install --ignore-platform-reqs - image: php:7.0-cli-alpine + image: php:7.0-cli-alpine3.4 script: - phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never @@ -16,6 +16,6 @@ test:7.1: - apk add --no-cache php7-phpdbg - curl -sS https://getcomposer.org/installer | php - php composer.phar install --ignore-platform-reqs - image: php:7.1-cli-alpine + image: php:7.1-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 6ca77250..5dab2200 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -6,7 +6,7 @@ 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 +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