diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fab84b9..2e8ee53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ test:7: - phpdbg -qrr -- vendor/bin/phpunit --coverage-text --colors=never test:7.1: + stage: test before_script: - sh build/docker_install.sh > /dev/null - apk add --no-cache php7-phpdbg @@ -16,4 +17,15 @@ test:7.1: - php composer.phar install --ignore-platform-reqs image: php:7.1-alpine script: - - phpdbg -qrr -- vendor/bin/phpunit --coverage-text --colors=never + - 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-alpine + script: + - phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1d3cc02..fd420a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ install: php: - 7 + - 7.1 + - 7.2 - hhvm - nightly diff --git a/build/docker_install.sh b/build/docker_install.sh index 7a5ca25..7ddee01 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # We need to install dependencies only for Docker [[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 @@ -7,6 +7,6 @@ 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 \ +apk add --no-cache \ curl \ git