From 1fdff3205a09ca43688c5f60dc3a3023a3e4e4e1 Mon Sep 17 00:00:00 2001 From: Voidtek Date: Wed, 6 Mar 2019 14:43:44 +0100 Subject: [PATCH 1/4] Add on Drone the php v7.2 with the matrix. --- .drone.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d2e0298..8c104ee 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ workspace: services: web: - image: fpfis/httpd-php-dev:7.1 + image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} environment: - DOCUMENT_ROOT=/test/openeuropa-site - COMPOSER_CACHE_DIR=/cache/composer @@ -22,7 +22,7 @@ pipeline: # Download all dependencies. composer-install: group: prepare - image: fpfis/httpd-php-dev:7.1 + image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} volumes: - /cache:/cache commands: @@ -37,13 +37,18 @@ pipeline: # Run grumphp tests. test-grumphp: group: test - image: fpfis/httpd-php-dev:7.1 + image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} commands: - ./vendor/bin/grumphp run # Run behat tests. test-behat: group: test - image: fpfis/httpd-php-dev:7.1 + image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} commands: - ./vendor/bin/behat --strict + + matrix: + PHP_VERSION: + - 7.1 + - 7.2 From 8f5de78e9b367e77bf9ef65b08b637d2de57216e Mon Sep 17 00:00:00 2001 From: Voidtek Date: Wed, 6 Mar 2019 14:49:18 +0100 Subject: [PATCH 2/4] OPENEUROPA-1628: Add on Drone the php v7.2 with the matrix. --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8c104ee..d355dbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,18 +37,18 @@ pipeline: # Run grumphp tests. test-grumphp: group: test - image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} + image: fpfis/httpd-php-full:${PHP_VERSION=7.1} commands: - ./vendor/bin/grumphp run # Run behat tests. test-behat: group: test - image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} + image: fpfis/httpd-php-full:${PHP_VERSION=7.1} commands: - ./vendor/bin/behat --strict - matrix: - PHP_VERSION: - - 7.1 - - 7.2 +matrix: + PHP_VERSION: + - 7.1 + - 7.2 From 950771898394367bfc2aca61fc5fe848455c519c Mon Sep 17 00:00:00 2001 From: Voidtek Date: Wed, 6 Mar 2019 15:00:10 +0100 Subject: [PATCH 3/4] OPENEUROPA-1628: Force to use httpd-php-dev for grumphp. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d355dbc..1853dbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,7 @@ pipeline: # Run grumphp tests. test-grumphp: group: test - image: fpfis/httpd-php-full:${PHP_VERSION=7.1} + image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} commands: - ./vendor/bin/grumphp run From bfe5194906164a718e421842a0ceb9ee556112d5 Mon Sep 17 00:00:00 2001 From: Voidtek Date: Mon, 11 Mar 2019 11:33:44 +0100 Subject: [PATCH 4/4] OPENEUROPA-1628: Revert use fpfis/httpd-php-full on drone. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1853dbc..70a4aa2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,7 @@ pipeline: # Run behat tests. test-behat: group: test - image: fpfis/httpd-php-full:${PHP_VERSION=7.1} + image: fpfis/httpd-php-dev:${PHP_VERSION=7.1} commands: - ./vendor/bin/behat --strict