From b334b4999e02098491d5af50c59b9b4ca261236c Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 29 Jan 2025 23:58:42 -0600 Subject: [PATCH] The great reaping of old PHP versions, drop 20.04 support too. --- .github/workflows/ci.yml | 8 +------- README.md | 2 +- meta/main.yml | 4 +--- molecule/default/7.4.yml | 24 ------------------------ tasks/setup-RedHat.yml | 14 -------------- vars/Debian.yml | 5 ----- 6 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 molecule/default/7.4.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af21416..4be20f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,17 +52,11 @@ jobs: # PHP 8.2. - distro: rockylinux9 playbook: 8.2.yml - - distro: ubuntu2404 + - distro: ubuntu2204 playbook: 8.2.yml - distro: debian12 playbook: 8.2.yml - # PHP 7.4. - - distro: ubuntu2004 - playbook: 7.4.yml - - distro: debian12 - playbook: 7.4.yml - steps: - name: Check out the codebase. uses: actions/checkout@v4 diff --git a/README.md b/README.md index f4fea28..51ae273 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Available variables are listed below, along with default values (see `defaults/m php_version: '8.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. `7.4`, `8.1`, `8.2`, or `8.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. `8.1`, `8.2`, or `8.3`). php_versions_install_recommends: false diff --git a/meta/main.yml b/meta/main.yml index e8b3eb9..8673902 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -15,10 +15,8 @@ galaxy_info: - all - name: Ubuntu versions: - - trusty - - xenial - - bionic - jammy + - noble galaxy_tags: - php - web diff --git a/molecule/default/7.4.yml b/molecule/default/7.4.yml deleted file mode 100644 index f77d70c..0000000 --- a/molecule/default/7.4.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Converge - hosts: all - #become: true - - vars: - php_enable_webserver: false - php_version: '7.4' - - 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/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 86a9ed4..4d0a140 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,18 +1,4 @@ --- -# TODO: PHP 7.2 support will be removed soon. This is only being left in here as -# a convenience for legacy PHP 7.2 users. -- name: Enable remi repo for PHP 7.2. - set_fact: php_enablerepo="remi,remi-php72" - when: php_version == "7.2" - -- name: Enable remi repo for PHP 7.3. - set_fact: php_enablerepo="remi,remi-php73" - when: php_version == "7.3" - -- name: Enable remi repo for PHP 7.4. - set_fact: php_enablerepo="remi,remi-php74" - when: php_version == "7.4" - - name: Enable remi repo for PHP 8.0. set_fact: php_enablerepo="remi,remi-php80" when: php_version == "8.0" diff --git a/vars/Debian.yml b/vars/Debian.yml index 06a7626..c34b553 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -39,11 +39,6 @@ __php_packages: - "php{{ php_version }}-yaml" php_versions_debian: - # TODO: PHP 7.2 support will be removed soon. This is only being left in here as - # a convenience for legacy PHP 7.2 users. - - php7.2-common - - php7.3-common - - php7.4-common - php8.0-common - php8.1-common - php8.2-common