From fb9c4eaf5d0bba48bd1a094cce95798cb7cbc9d5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Jan 2025 22:33:57 +0100 Subject: [PATCH 1/2] Drop support for EoL distros and Puppet 7 Puppet 7 is soon EoL and OpenVox doesn't provide packages for version 7, only 8. --- lib/puppet_metadata/aio.rb | 44 +++++++++----------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/lib/puppet_metadata/aio.rb b/lib/puppet_metadata/aio.rb index 19ae91d..bdf05e7 100644 --- a/lib/puppet_metadata/aio.rb +++ b/lib/puppet_metadata/aio.rb @@ -12,53 +12,29 @@ class AIO BUILDS = { # RPM-based 'RedHat' => { - '5' => 5..7, - '6' => 5..7, - '7' => 5..8, - '8' => 5..8, - '9' => 6..8, + '8' => [8], + '9' => [8], }, 'Fedora' => { - '26' => [5], - '27' => 5..6, - '28' => 5..6, - '29' => 5..6, - '30' => 5..7, - '31' => 5..7, - '32' => 6..7, - '34' => 6..7, - '36' => 7..8, - '40' => 7..8, + '36' => [8], + '40' => [8], }, 'SLES' => { - '11' => [7], - '12' => 7..8, - '15' => 7..8, + '15' => [8], }, # deb-based 'Debian' => { - '7' => [5], - '8' => 5..6, - '9' => 5..7, - '10' => 5..8, - '11' => 6..8, - '12' => 7..8, + '11' => [8], + '12' => [8], }, 'Ubuntu' => { - '14.04' => 5..6, - '16.04' => 5..7, - '18.04' => 5..8, - '20.04' => 6..8, - '22.04' => 6..8, - '24.04' => 7..8, + '20.04' => [8], + '22.04' => [8], + '24.04' => [8], }, }.freeze PUPPET_RUBY_VERSIONS = { - 4 => '2.1', - 5 => '2.4', - 6 => '2.5', - 7 => '2.7', 8 => '3.2', }.freeze From 7eebd733cd6578b633403cb2921629e4ff16f23e Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Jan 2025 22:06:13 +0100 Subject: [PATCH 2/2] Switch to new OpenVox packages --- lib/puppet_metadata/github_actions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet_metadata/github_actions.rb b/lib/puppet_metadata/github_actions.rb index 82b56ed..250e28c 100644 --- a/lib/puppet_metadata/github_actions.rb +++ b/lib/puppet_metadata/github_actions.rb @@ -31,7 +31,7 @@ def puppet_major_versions { name: "Puppet #{version}", value: version, - collection: "puppet#{version}", + collection: "openvox#{version}", } end.compact end