Various PHP and platform updates

- Add support for PHP 8.3 and 8.4 - Remove support for PHP 5.6, 7.0 and 7.1 - Remove support for CentOS 7 and CentOS Stream 8 Signed-off-by: Lance Albertson <[email protected]>
sous-chefs · Oct 18, 2024 · 5106f1d · 5106f1d
1 parent 1b0059d
commit 5106f1d
Show file tree

Hide file tree

Showing 64 changed files with 291 additions and 893 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,64 +25,26 @@ jobs:
         os:
           - almalinux-8
           - almalinux-9
-          # - centos-7
           - centos-stream-9
           - fedora-latest
           - rockylinux-8
           - rockylinux-9
         suite:
           - 'remi'
           - 'remi-test'
-          - 'remi-php56'
-          - 'remi-php70'
-          - 'remi-php71'
           - 'remi-php72'
           - 'remi-php73'
           - 'remi-php74'
           - 'remi-php80'
           - 'remi-php81'
           - 'remi-php82'
+          - 'remi-php83'
+          - 'remi-php84'
         exclude:
           - os: almalinux-8
             suite: remi-test
           - os: almalinux-9
             suite: remi-test
-          - os: almalinux-8
-            suite: remi-php56
-          - os: almalinux-9
-            suite: remi-php56
-          - os: centos-stream-9
-            suite: remi-php56
-          - os: rockylinux-8
-            suite: remi-php56
-          - os: rockylinux-9
-            suite: remi-php56
-          - os: fedora-latest
-            suite: remi-php56
-          - os: almalinux-8
-            suite: remi-php70
-          - os: almalinux-9
-            suite: remi-php70
-          - os: centos-stream-9
-            suite: remi-php70
-          - os: fedora-latest
-            suite: remi-php70
-          - os: rockylinux-8
-            suite: remi-php70
-          - os: rockylinux-9
-            suite: remi-php70
-          - os: almalinux-8
-            suite: remi-php71
-          - os: almalinux-9
-            suite: remi-php71
-          - os: centos-stream-9
-            suite: remi-php71
-          - os: fedora-latest
-            suite: remi-php71
-          - os: rockylinux-8
-            suite: remi-php71
-          - os: rockylinux-9
-            suite: remi-php71
           - os: almalinux-9
             suite: remi-php72
           - os: centos-stream-9

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This file is used to list changes made in each version of the yum-remi-chef  coo
 
 ## Unreleased
 
+- Add support for PHP 8.3 and 8.4
+- Remove support for PHP 5.6, 7.0 and 7.1
+- Remove support for CentOS 7 and CentOS Stream 8
+
 ## 7.1.0 - *2024-07-31*
 
 - Update for Fedora 39 and 40

diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@
 [![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors)
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
 
-The yum-remi-chef cookbook takes over management of the repository ids of the [remi](https://rpms.remirepo.net/) repository . It allows attribute manipulation of `remi`, `remi-safe`, `remi-php56`, `remi-php70`, `remi-php71`, `remi-php72`, `remi-php73`, `remi-php74`, `remi-php80`, `remi-php81`, `remi-php82` and `remi-test` repositories.
+The yum-remi-chef cookbook takes over management of the repository ids of the [remi](https://rpms.remirepo.net/)
+repository . It allows attribute manipulation of `remi`, `remi-safe`, `remi-php72`, `remi-php73`, `remi-php74`,
+`remi-php80`, `remi-php81`, `remi-php82`, `remi-php83`, `remi-php84` and `remi-test` repositories.
 
 ## Maintainers
 
@@ -27,16 +29,14 @@ This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of
 
 The following platforms and PHP versions are supported, as per [upstream](https://rpms.remirepo.net) -- `x` via a Yum repo, `M` via DNF modules:
 
-| PHP version     | 5.6 | 7.0 | 7.1 | 7.2 | 7.3 | 7.4 | 8.0 | 8.1 | 8.2 |
-| --------------- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
-| AlmaLinux 8     |     |     |     | M   | M   | M   | M   | M   | M   |
-| AlmaLinux 9     |     |     |     |     |     | M   | M   | M   | M   |
-| CentOS 7        | x   | x   | x   | x   | x   | x   | x   | x   | x   |
-| CentOS Stream 8 |     |     |     | M   | M   | M   | M   | M   | M   |
-| CentOS Stream 9 |     |     |     |     |     | M   | M   | M   | M   |
-| Fedora (latest) |     |     |     |     |     |     |     | M   | M   |
-| Rocky Linux 8   |     |     |     | M   | M   | M   | M   | M   | M   |
-| Rocky Linux 9   |     |     |     |     |     | M   | M   | M   | M   |
+| PHP version     | 7.2 | 7.3 | 7.4 | 8.0 | 8.1 | 8.2 | 8.3 | 8.4 |
+| --------------- | --- | --- | --- | --- | --- | --- | --- | --- |
+| AlmaLinux 8     | M   | M   | M   | M   | M   | M   | M   | M   |
+| AlmaLinux 9     |     |     | M   | M   | M   | M   | M   | M   |
+| CentOS Stream 9 |     |     | M   | M   | M   | M   | M   | M   |
+| Fedora (latest) |     |     |     |     | M   | M   | M   | M   |
+| Rocky Linux 8   | M   | M   | M   | M   | M   | M   | M   | M   |
+| Rocky Linux 9   |     |     | M   | M   | M   | M   | M   | M   |
 
 ## Recipes
 
@@ -54,15 +54,14 @@ Same function as the above recipes, but as resources instead.
 - [`yum_remi_safe`](documentation/remi_safe.md)
 - [`yum_remi_test`](documentation/remi_test.md)
 - [`yum_remi_modular`](documentation/remi_modular.md)
-- [`yum_remi_php56`](documentation/remi_php56.md)
-- [`yum_remi_php70`](documentation/remi_php70.md)
-- [`yum_remi_php71`](documentation/remi_php71.md)
 - [`yum_remi_php72`](documentation/remi_php72.md)
 - [`yum_remi_php73`](documentation/remi_php73.md)
 - [`yum_remi_php74`](documentation/remi_php74.md)
 - [`yum_remi_php80`](documentation/remi_php80.md)
 - [`yum_remi_php81`](documentation/remi_php81.md)
 - [`yum_remi_php82`](documentation/remi_php82.md)
+- [`yum_remi_php83`](documentation/remi_php83.md)
+- [`yum_remi_php84`](documentation/remi_php84.md)
 
 ## Contributors
 

diff --git a/attributes/remi-gpgkey.rb b/attributes/remi-gpgkey.rb
@@ -4,12 +4,6 @@
   case node['platform_family']
   when 'fedora'
     case node['platform_version'].to_i
-    when 32, 33
-      'https://rpms.remirepo.net/RPM-GPG-KEY-remi2020'
-    when 34, 35
-      'https://rpms.remirepo.net/RPM-GPG-KEY-remi2021'
-    when 36, 37
-      'https://rpms.remirepo.net/RPM-GPG-KEY-remi2022'
     when 38, 39
       'https://rpms.remirepo.net/RPM-GPG-KEY-remi2023'
     when 40
@@ -19,8 +13,6 @@
     end
   when 'rhel'
     case node['platform_version'].to_i
-    when 7
-      'https://rpms.remirepo.net/RPM-GPG-KEY-remi'
     when 8
       'https://rpms.remirepo.net/RPM-GPG-KEY-remi2018'
     when 9

diff --git a/attributes/remi-php56-debuginfo.rb b/attributes/remi-php56-debuginfo.rb
diff --git a/attributes/remi-php56.rb b/attributes/remi-php56.rb
diff --git a/attributes/remi-php70-debuginfo.rb b/attributes/remi-php70-debuginfo.rb
diff --git a/attributes/remi-php70.rb b/attributes/remi-php70.rb
diff --git a/attributes/remi-php71-debuginfo.rb b/attributes/remi-php71-debuginfo.rb
diff --git a/attributes/remi-php71.rb b/attributes/remi-php71.rb
diff --git a/attributes/remi-php72.rb b/attributes/remi-php72.rb
@@ -10,10 +10,6 @@
   default['yum']['remi-php72']['description'] = "Remi's PHP 7.2 RPM repository for Fedora Linux #{node['platform_version'].to_i} - $basearch"
 when 'rhel'
   # default['yum']['remi-php72']['baseurl'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php72/$basearch/"
-  default['yum']['remi-php72']['mirrorlist'] = if node['platform_version'].to_i == 7
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php72/mirror"
-                                               else
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php72/$basearch/mirror"
-                                               end
+  default['yum']['remi-php72']['mirrorlist'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php72/$basearch/mirror"
   default['yum']['remi-php72']['description'] = "Remi's PHP 7.2 RPM repository for Enterprise Linux #{node['platform_version'].to_i} - $basearch"
 end
diff --git a/attributes/remi-php73.rb b/attributes/remi-php73.rb
@@ -10,10 +10,6 @@
   default['yum']['remi-php73']['description'] = "Remi's PHP 7.3 RPM repository for Fedora Linux #{node['platform_version'].to_i} - $basearch"
 when 'rhel'
   # default['yum']['remi-php73']['baseurl'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php73/$basearch/"
-  default['yum']['remi-php73']['mirrorlist'] = if node['platform_version'].to_i == 7
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php73/mirror"
-                                               else
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php73/$basearch/mirror"
-                                               end
+  default['yum']['remi-php73']['mirrorlist'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php73/$basearch/mirror"
   default['yum']['remi-php73']['description'] = "Remi's PHP 7.3 RPM repository for Enterprise Linux #{node['platform_version'].to_i} - $basearch"
 end
diff --git a/attributes/remi-php74.rb b/attributes/remi-php74.rb
@@ -10,10 +10,6 @@
   default['yum']['remi-php74']['description'] = "Remi's PHP 7.4 RPM repository for Fedora Linux #{node['platform_version'].to_i} - $basearch"
 when 'rhel'
   # default['yum']['remi-php74']['baseurl'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php74/$basearch/"
-  default['yum']['remi-php74']['mirrorlist'] = if node['platform_version'].to_i == 7
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php74/mirror"
-                                               else
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php74/$basearch/mirror"
-                                               end
+  default['yum']['remi-php74']['mirrorlist'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php74/$basearch/mirror"
   default['yum']['remi-php74']['description'] = "Remi's PHP 7.4 RPM repository for Enterprise Linux #{node['platform_version'].to_i} - $basearch"
 end
diff --git a/attributes/remi-php80.rb b/attributes/remi-php80.rb
@@ -10,10 +10,6 @@
   default['yum']['remi-php80']['description'] = "Remi's PHP 8.0 RPM repository for Fedora Linux #{node['platform_version'].to_i} - $basearch"
 when 'rhel'
   # default['yum']['remi-php80']['baseurl'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php80/$basearch/"
-  default['yum']['remi-php80']['mirrorlist'] = if node['platform_version'].to_i == 7
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php80/mirror"
-                                               else
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php80/$basearch/mirror"
-                                               end
+  default['yum']['remi-php80']['mirrorlist'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php80/$basearch/mirror"
   default['yum']['remi-php80']['description'] = "Remi's PHP 8.0 RPM repository for Enterprise Linux #{node['platform_version'].to_i} - $basearch"
 end
diff --git a/attributes/remi-php81.rb b/attributes/remi-php81.rb
@@ -10,10 +10,6 @@
   default['yum']['remi-php81']['description'] = "Remi's PHP 8.1 RPM repository for Fedora Linux #{node['platform_version'].to_i} - $basearch"
 when 'rhel'
   # default['yum']['remi-php81']['baseurl'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php81/$basearch/"
-  default['yum']['remi-php81']['mirrorlist'] = if node['platform_version'].to_i == 7
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php81/mirror"
-                                               else
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php81/$basearch/mirror"
-                                               end
+  default['yum']['remi-php81']['mirrorlist'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php81/$basearch/mirror"
   default['yum']['remi-php81']['description'] = "Remi's PHP 8.1 RPM repository for Enterprise Linux #{node['platform_version'].to_i} - $basearch"
 end
diff --git a/attributes/remi-php82.rb b/attributes/remi-php82.rb
@@ -10,10 +10,6 @@
   default['yum']['remi-php82']['description'] = "Remi's PHP 8.2 RPM repository for Fedora Linux #{node['platform_version'].to_i} - $basearch"
 when 'rhel'
   # default['yum']['remi-php82']['baseurl'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php82/$basearch/"
-  default['yum']['remi-php82']['mirrorlist'] = if node['platform_version'].to_i == 7
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php82/mirror"
-                                               else
-                                                 "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php82/$basearch/mirror"
-                                               end
+  default['yum']['remi-php82']['mirrorlist'] = "http://cdn.remirepo.net/enterprise/#{node['platform_version'].to_i}/php82/$basearch/mirror"
   default['yum']['remi-php82']['description'] = "Remi's PHP 8.2 RPM repository for Enterprise Linux #{node['platform_version'].to_i} - $basearch"
 end