From 0d7faa8aa18e2c9b373a8575184061b7b95c7720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 25 Aug 2021 07:42:22 -1000 Subject: [PATCH 1/4] Allow stdlib 8.0.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index efa7eb9c..aa042ab0 100644 --- a/metadata.json +++ b/metadata.json @@ -11,7 +11,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.16.0 < 8.0.0" + "version_requirement": ">= 4.16.0 < 9.0.0" }, { "name": "puppetlabs/apt", From dffc26f50ef2b536004ac1ff75944a53f51d7b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 25 Aug 2021 17:08:50 -1000 Subject: [PATCH 2/4] Fix CI --- spec/classes/php_spec.rb | 12 ++++++++++++ spec/defines/extension_spec.rb | 2 ++ spec/defines/fpm_pool_spec.rb | 2 ++ 3 files changed, 16 insertions(+) diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb index 135626a4..35c88625 100644 --- a/spec/classes/php_spec.rb +++ b/spec/classes/php_spec.rb @@ -10,6 +10,8 @@ php_cli_package = case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + 'php7.4-cli' when '10' 'php7.3-cli' when '9' @@ -32,6 +34,8 @@ php_fpm_package = case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + 'php7.4-fpm' when '10' 'php7.3-fpm' when '9' @@ -54,6 +58,8 @@ php_dev_package = case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + 'php7.4-dev' when '10' 'php7.3-dev' when '9' @@ -175,6 +181,8 @@ case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + '/etc/php/7.4/fpm/pool.d/www.conf' when '10' '/etc/php/7.3/fpm/pool.d/www.conf' when '9' @@ -217,6 +225,8 @@ case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + '/etc/php/7.4/fpm/pool.d/www.conf' when '10' '/etc/php/7.3/fpm/pool.d/www.conf' when '9' @@ -259,6 +269,8 @@ case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + '/etc/php/7.4/fpm/pool.d/www.conf' when '10' '/etc/php/7.3/fpm/pool.d/www.conf' when '9' diff --git a/spec/defines/extension_spec.rb b/spec/defines/extension_spec.rb index 2278c6fd..32e2612f 100644 --- a/spec/defines/extension_spec.rb +++ b/spec/defines/extension_spec.rb @@ -12,6 +12,8 @@ etcdir = case facts[:os]['name'] when 'Debian' case facts[:os]['release']['major'] + when '11' + '/etc/php/7.4/mods-available' when '10' '/etc/php/7.3/mods-available' when '9' diff --git a/spec/defines/fpm_pool_spec.rb b/spec/defines/fpm_pool_spec.rb index 1deca1ae..e15d4689 100644 --- a/spec/defines/fpm_pool_spec.rb +++ b/spec/defines/fpm_pool_spec.rb @@ -15,6 +15,8 @@ let(:params) { {} } case facts[:os]['release']['major'] + when '11' + it { is_expected.to contain_file('/etc/php/7.4/fpm/pool.d/unique-name.conf') } when '10' it { is_expected.to contain_file('/etc/php/7.3/fpm/pool.d/unique-name.conf') } when '9' From e42a46cba7a1f48c2700bc6118676c00d7503a40 Mon Sep 17 00:00:00 2001 From: Christos Papageorgiou Date: Thu, 26 Aug 2021 16:45:12 +0300 Subject: [PATCH 3/4] Allow puppet/archive 6.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index aa042ab0..5b19d6fc 100644 --- a/metadata.json +++ b/metadata.json @@ -27,7 +27,7 @@ }, { "name": "puppet/archive", - "version_requirement": ">= 1.0.0 < 6.0.0" + "version_requirement": ">= 1.0.0 < 8.0.0" } ], "requirements": [ From e53d63ba2d1911b78d188e9cb25f75f5d23e02fe Mon Sep 17 00:00:00 2001 From: Christos Papageorgiou Date: Thu, 26 Aug 2021 16:50:28 +0300 Subject: [PATCH 4/4] Allow puppet/zypprepo 4.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 5b19d6fc..253353f4 100644 --- a/metadata.json +++ b/metadata.json @@ -23,7 +23,7 @@ }, { "name": "puppet/zypprepo", - "version_requirement": ">= 2.0.0 < 3.0.0" + "version_requirement": ">= 2.0.0 < 5.0.0" }, { "name": "puppet/archive",