From 4a946e613640f85d2f6e085cb609a776a88465a9 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 6 Sep 2024 15:14:10 +0200 Subject: [PATCH] Gemfile: Allow Puppet 7 and 8 --- config_defaults.yml | 2 +- moduleroot/Gemfile.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config_defaults.yml b/config_defaults.yml index 3df6e799..4d1a5ac6 100644 --- a/config_defaults.yml +++ b/config_defaults.yml @@ -12,7 +12,7 @@ Jenkinsfile: delete: true Gemfile: - puppet_version: '~> 7.24' + puppet_version: ['>= 7.24', '< 9'] required: ':test': - gem: voxpupuli-test diff --git a/moduleroot/Gemfile.erb b/moduleroot/Gemfile.erb index a67b4685..05283c8d 100644 --- a/moduleroot/Gemfile.erb +++ b/moduleroot/Gemfile.erb @@ -35,7 +35,7 @@ end gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || '<%= @configs['puppet_version'] %>' +puppetversion = ENV['PUPPET_GEM_VERSION'] || <%= @configs['puppet_version'].inspect %> gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby