From 84a560d4478ddd7a975f8ce86c1dfba00b9ff033 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 6 Dec 2018 15:29:10 -0600 Subject: [PATCH] Fixes #27: Default to PHP 7.2, fully support PHP 7.3. --- .gitignore | 2 -- .travis.yml | 18 ++++---------- README.md | 6 ++--- defaults/main.yml | 2 +- meta/main.yml | 5 +--- .../{playbook-5.6.yml => playbook-7.1.yml} | 2 +- molecule/default/playbook-7.2.yml | 24 ------------------- molecule/default/playbook.yml | 2 +- molecule/default/tests/test_default.py | 14 ----------- vars/Debian-php7.2.yml | 17 ------------- vars/Debian.yml | 1 - 11 files changed, 11 insertions(+), 82 deletions(-) rename molecule/default/{playbook-5.6.yml => playbook-7.1.yml} (95%) delete mode 100644 molecule/default/playbook-7.2.yml delete mode 100644 molecule/default/tests/test_default.py delete mode 100644 vars/Debian-php7.2.yml diff --git a/.gitignore b/.gitignore index f56f5b5..a8b42eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ *.retry -*/__pycache__ -*.pyc diff --git a/.travis.yml b/.travis.yml index dda43a4..6997c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: global: - ROLE_NAME: php-versions matrix: - # Default PHP version (7.1). + # Default PHP version (7.2). - MOLECULE_DISTRO: centos7 - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_DISTRO: ubuntu1604 @@ -23,21 +23,11 @@ env: - MOLECULE_DISTRO: debian9 MOLECULE_PLAYBOOK: playbook-7.3.yml - # PHP 7.2. + # PHP 7.1. - MOLECULE_DISTRO: centos7 - MOLECULE_PLAYBOOK: playbook-7.2.yml + MOLECULE_PLAYBOOK: playbook-7.1.yml - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_PLAYBOOK: playbook-7.2.yml - - MOLECULE_DISTRO: ubuntu1604 - MOLECULE_PLAYBOOK: playbook-7.2.yml - - MOLECULE_DISTRO: debian9 - MOLECULE_PLAYBOOK: playbook-7.2.yml - - # PHP 5.6. - - MOLECULE_DISTRO: centos7 - MOLECULE_PLAYBOOK: playbook-5.6.yml - - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_PLAYBOOK: playbook-5.6.yml + MOLECULE_PLAYBOOK: playbook-7.1.yml install: # Install test dependencies. diff --git a/README.md b/README.md index 8318361..6e38be2 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ N/A Available variables are listed below, along with default values (see `defaults/main.yml`): - php_version: '7.1' + php_version: '7.7' -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.0`, `7.1`, 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. `5.6`, `7.1`, `7.2`, `7.3`, 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.1' + php_version: '7.2' roles: - role: geerlingguy.repo-remi diff --git a/defaults/main.yml b/defaults/main.yml index c2a10a0..481414e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # The PHP version to be installed. -php_version: '7.1' +php_version: '7.2' # For Debian OSes only. php_versions_install_recommends: false diff --git a/meta/main.yml b/meta/main.yml index 038667d..267f3b7 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,7 +5,7 @@ galaxy_info: author: geerlingguy description: Allows different PHP versions to be installed. company: "Midwestern Mac, LLC" - license: "license (BSD, MIT)" + license: "MIT" issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues min_ansible_version: 2.4 platforms: @@ -17,9 +17,6 @@ galaxy_info: - all - name: Ubuntu versions: - - precise - - raring - - saucy - trusty - xenial - bionic diff --git a/molecule/default/playbook-5.6.yml b/molecule/default/playbook-7.1.yml similarity index 95% rename from molecule/default/playbook-5.6.yml rename to molecule/default/playbook-7.1.yml index 915c296..d9b5f5a 100644 --- a/molecule/default/playbook-5.6.yml +++ b/molecule/default/playbook-7.1.yml @@ -5,7 +5,7 @@ vars: php_enable_webserver: false - php_version: '5.6' + php_version: '7.1' pre_tasks: - name: Update apt cache. diff --git a/molecule/default/playbook-7.2.yml b/molecule/default/playbook-7.2.yml deleted file mode 100644 index ccef732..0000000 --- a/molecule/default/playbook-7.2.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Converge - hosts: all - become: true - - vars: - php_enable_webserver: false - php_version: '7.2' - - pre_tasks: - - name: Update apt cache. - apt: update_cache=true cache_valid_time=600 - when: ansible_os_family == 'Debian' - - roles: - - role: geerlingguy.repo-remi - when: ansible_os_family == 'RedHat' - - role: geerlingguy.php-versions - - role: geerlingguy.php - - post_tasks: - - name: Confirm PHP version is correct. - shell: "php -v | grep -F '{{ php_version }}'" - changed_when: false diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml index d9b5f5a..ccef732 100644 --- a/molecule/default/playbook.yml +++ b/molecule/default/playbook.yml @@ -5,7 +5,7 @@ vars: php_enable_webserver: false - php_version: '7.1' + php_version: '7.2' pre_tasks: - name: Update apt cache. diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py deleted file mode 100644 index eedd64a..0000000 --- a/molecule/default/tests/test_default.py +++ /dev/null @@ -1,14 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') - - -def test_hosts_file(host): - f = host.file('/etc/hosts') - - assert f.exists - assert f.user == 'root' - assert f.group == 'root' diff --git a/vars/Debian-php7.2.yml b/vars/Debian-php7.2.yml deleted file mode 100644 index 8bdf70d..0000000 --- a/vars/Debian-php7.2.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -__php_packages: - - "php{{ php_version }}" - - "php{{ php_version }}-apcu" - - "php{{ php_version }}-cli" - - "php{{ php_version }}-common" - - "php{{ php_version }}-curl" - - "php{{ php_version }}-dev" - - "php{{ php_version }}-fpm" - - "php{{ php_version }}-gd" - - "php{{ php_version }}-imap" - - "php{{ php_version }}-json" - - "php{{ php_version }}-mbstring" - - "php{{ php_version }}-opcache" - - "php{{ php_version }}-sqlite3" - - "php{{ php_version }}-xml" - - "php{{ php_version }}-yaml" diff --git a/vars/Debian.yml b/vars/Debian.yml index 8c6dbca..5a7b475 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -33,7 +33,6 @@ __php_packages: - "php{{ php_version }}-imap" - "php{{ php_version }}-json" - "php{{ php_version }}-mbstring" - - "php{{ php_version }}-mcrypt" - "php{{ php_version }}-opcache" - "php{{ php_version }}-sqlite3" - "php{{ php_version }}-xml"