Skip to content

Commit

Permalink
Drop old Debian and Ubuntu versions, update CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Jul 31, 2024
1 parent c30d976 commit 9d88c26
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 48 deletions.
43 changes: 0 additions & 43 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
php_enablerepo: "remi,remi-php82"
php_install_recommends: false

handlers:
- name: update apt cache
apt: update_cache=true
when: ansible_os_family == 'Debian'

pre_tasks:
- name: Update apt cache.
apt:
Expand All @@ -23,44 +18,6 @@
when: ansible_os_family == 'Debian'
changed_when: false

- name: Ensure dirmngr is installed (gnupg dependency).
apt:
name: dirmngr
state: present
when: ansible_os_family == 'Debian'

# Debian-specific tasks.
- name: Add dependencies for PHP versions (Debian).
apt:
name:
- apt-transport-https
- ca-certificates
- gnupg2
state: present
when: ansible_distribution == "Debian"

- name: Add Ondrej Sury's repo for PHP 8 (Ubuntu).
apt_repository:
repo: 'ppa:ondrej/php'
when:
- ansible_distribution == 'Ubuntu'
- ansible_distribution_major_version <= 22

- name: Add Ondrej Sury's apt key (Debian).
apt_key:
url: https://packages.sury.org/php/apt.gpg
state: present
when: ansible_distribution == "Debian"

- name: Add Ondrej Sury's repo (Debian).
apt_repository:
repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
state: present
when: ansible_distribution == "Debian"
notify: update apt cache

- meta: flush_handlers

roles:
- role: geerlingguy.repo-remi
when:
Expand Down
2 changes: 0 additions & 2 deletions vars/Debian-10.yml

This file was deleted.

2 changes: 1 addition & 1 deletion vars/Debian.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
__php_default_version_debian: "7.0"
__php_default_version_debian: "8.2"
__php_packages:
- php{{ php_default_version_debian }}-common
- php{{ php_default_version_debian }}-cli
Expand Down
2 changes: 0 additions & 2 deletions vars/Ubuntu-18.yml

This file was deleted.

0 comments on commit 9d88c26

Please sign in to comment.