Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OPENEUROPA-2258: Use PHP 7.2 in drone and docker image. #13

Merged
merged 2 commits into from
Oct 30, 2019
Merged

OPENEUROPA-2258: Use PHP 7.2 in drone and docker image. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dc5c93
OPENEUROPA-2258: Use PHP 7.2 in drone and docker image.
Sep 18, 2019
0958740
OPENEUROPA-2258: Use higher version of packages for composer prefer l…
Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ workspace:

services:
web:
image: fpfis/httpd-php-ci:7.1
image: fpfis/httpd-php-ci:${PHP_VERSION=7.2}
environment:
- DOCUMENT_ROOT=/test/entity_version
mysql:
Expand All @@ -15,15 +15,15 @@ services:
pipeline:
composer-install:
group: prepare
image: fpfis/httpd-php-ci:7.1
image: fpfis/httpd-php-ci:${PHP_VERSION=7.2}
volumes:
- /cache:/cache
commands:
- composer install --ansi --no-suggest --no-progress

composer-update-lowest:
group: post-prepare
image: fpfis/httpd-php-ci:7.1
image: fpfis/httpd-php-ci:${PHP_VERSION=7.2}
volumes:
- /cache:/cache
commands:
Expand All @@ -35,23 +35,26 @@ pipeline:
COMPOSER_BOUNDARY: lowest

site-install:
image: fpfis/httpd-php-ci:7.1
image: fpfis/httpd-php-ci:${PHP_VERSION=7.2}
commands:
- ./vendor/bin/run drupal:site-install

grumphp:
group: test
image: fpfis/httpd-php-ci:7.1
image: fpfis/httpd-php-ci:${PHP_VERSION=7.2}
commands:
- ./vendor/bin/grumphp run

phpunit:
group: test
image: fpfis/httpd-php-ci:7.1
image: fpfis/httpd-php-ci:${PHP_VERSION=7.2}
commands:
- ./vendor/bin/phpunit

matrix:
COMPOSER_BOUNDARY:
- lowest
- highest
- lowest
- highest
PHP_VERSION:
- 7.1
- 7.2
9 changes: 4 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
"drupal-composer/drupal-scaffold": "~2.2",
"drupal/config_devel": "~1.2",
"drush/drush": "~9.0@stable",
"guzzlehttp/guzzle": "~6.3",
"openeuropa/code-review": "~1.0.0-beta2",
"openeuropa/drupal-core-require-dev": "^8.7",
"openeuropa/task-runner": "~1.0.0-beta5",
"phpunit/phpunit": "~6.0",
"symfony/browser-kit": "~4.3"
},
"_readme": [
"symfony/browser-kit is explicitly required to make phpunit tests pass for 'composer update --prefer-lowest'."
"We explicitly require guzzlehttp/guzzle to allow phpunit tests after 'composer update --prefer-lowest' to complete successfully.",
"We explicitly require symfony/browser-kit to allow phpunit tests after 'composer update --prefer-lowest' to complete successfully."
],
"scripts": {
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
Expand Down Expand Up @@ -55,9 +57,6 @@
}
},
"config": {
"sort-packages": true,
"platform": {
"php": "7.1.9"
}
"sort-packages": true
}
}
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
web:
image: fpfis/httpd-php-dev:7.1
image: fpfis/httpd-php-dev:7.2
working_dir: /var/www/html
ports:
- 8080:8080
Expand Down