Fixes #43: Add support for PHP 7.4, default to 7.3.

This commit is contained in:
Jeff Geerling 2019-12-02 12:28:03 -06:00
parent 471d6d08cc
commit 9d6fc75b14
6 changed files with 20 additions and 22 deletions

View File

@ -6,28 +6,26 @@ env:
global:
- ROLE_NAME: php-versions
matrix:
# Default PHP version (7.2).
- MOLECULE_DISTRO: centos7
# Default PHP version (7.3).
- MOLECULE_DISTRO: centos8
- MOLECULE_DISTRO: ubuntu1804
- MOLECULE_DISTRO: ubuntu1604
- MOLECULE_DISTRO: debian9
- MOLECULE_DISTRO: debian10
# PHP 7.3.
- MOLECULE_DISTRO: centos7
# PHP 7.4.
- MOLECULE_DISTRO: centos8
MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
MOLECULE_PLAYBOOK: playbook-7.3.yml
MOLECULE_PLAYBOOK: playbook-7.4.yml
- MOLECULE_DISTRO: ubuntu1804
MOLECULE_PLAYBOOK: playbook-7.3.yml
- MOLECULE_DISTRO: ubuntu1604
MOLECULE_PLAYBOOK: playbook-7.3.yml
- MOLECULE_DISTRO: debian9
MOLECULE_PLAYBOOK: playbook-7.3.yml
MOLECULE_PLAYBOOK: playbook-7.4.yml
- MOLECULE_DISTRO: debian10
MOLECULE_PLAYBOOK: playbook-7.4.yml
# PHP 7.1.
- MOLECULE_DISTRO: centos7
MOLECULE_PLAYBOOK: playbook-7.1.yml
# PHP 7.2.
- MOLECULE_DISTRO: centos8
MOLECULE_PLAYBOOK: playbook-7.2.yml
- MOLECULE_DISTRO: ubuntu1804
MOLECULE_PLAYBOOK: playbook-7.1.yml
MOLECULE_PLAYBOOK: playbook-7.2.yml
install:
# Install test dependencies.

View File

@ -12,9 +12,9 @@ N/A
Available variables are listed below, along with default values (see `defaults/main.yml`):
php_version: '7.2'
php_version: '7.3'
The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.1`, `7.2`, `7.3`, etc.).
The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `7.2`, `7.3`, `7.4` etc.).
php_versions_install_recommends: false
@ -30,7 +30,7 @@ The PHP version to be installed. Any [currently-supported PHP major version](htt
- hosts: webservers
vars:
php_version: '7.2'
php_version: '7.3'
roles:
- role: geerlingguy.repo-remi

View File

@ -1,6 +1,6 @@
---
# The PHP version to be installed.
php_version: '7.2'
php_version: '7.3'
# For Debian OSes only.
php_versions_install_recommends: false

View File

@ -6,7 +6,7 @@ galaxy_info:
description: Allows different PHP versions to be installed.
company: "Midwestern Mac, LLC"
license: "MIT"
issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
issue_tracker_url: https://github.com/geerlingguy/ansible-role-php-versions/issues
min_ansible_version: 2.4
platforms:
- name: EL

View File

@ -5,7 +5,7 @@
vars:
php_enable_webserver: false
php_version: '7.1'
php_version: '7.2'
pre_tasks:
- name: Update apt cache.

View File

@ -5,7 +5,7 @@
vars:
php_enable_webserver: false
php_version: '7.3'
php_version: '7.4'
pre_tasks:
- name: Update apt cache.