From 097d86c93f00b4987e384de839645f90376e9291 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Tue, 4 Jun 2024 10:46:07 -0700 Subject: Update Beaker to 6 and beaker-puppet to 4 --- .sync.yml | 4 ++-- Gemfile | 4 ++-- metadata.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.sync.yml b/.sync.yml index 1321017..268c44c 100644 --- a/.sync.yml +++ b/.sync.yml @@ -3,7 +3,7 @@ Gemfile: optional: ":development": - gem: beaker - version: '~> 5.0' + version: '~> 6.0' from_env: BEAKER_VERSION - gem: beaker-abs from_env: BEAKER_ABS_VERSION @@ -16,7 +16,7 @@ Gemfile: # beaker-puppet supports newer Rubies (PA-6136) - gem: beaker-puppet from_env: BEAKER_PUPPET_VERSION - version: '~> 3.0' + version: '~> 4.0' condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem: async version: '~> 1' diff --git a/Gemfile b/Gemfile index 6a5f4e0..dfcffa7 100644 --- a/Gemfile +++ b/Gemfile @@ -36,11 +36,11 @@ group :development do gem "rubocop-rspec", '= 2.19.0', require: false gem "puppet-strings", '~> 4.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0') + gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 6.0') gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0') gem "beaker-hostgenerator" gem "beaker-rspec" - gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "async", '~> 1', require: false gem "beaker-module_install_helper", require: false gem "beaker-puppet_install_helper", require: false diff --git a/metadata.json b/metadata.json index dfafeee..936b18f 100644 --- a/metadata.json +++ b/metadata.json @@ -57,7 +57,7 @@ "version_requirement": ">= 6.0.0 < 9.0.0" } ], - "pdk-version": "3.0.1", + "pdk-version": "3.2.0", "template-url": "https://github.com/puppetlabs/pdk-templates#3.0.1", "template-ref": "tags/3.0.1-0-gd13288a" } -- cgit v1.2.3