From 7d1655fc9f4cc5bfa1ab6ece321418be70a2bdb5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 27 Nov 2023 13:32:09 +0100 Subject: [PATCH 1/3] r10k: Require version 4 --- bolt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt.gemspec b/bolt.gemspec index 8f6fdb8e1..fe9dfe99a 100644 --- a/bolt.gemspec +++ b/bolt.gemspec @@ -60,7 +60,7 @@ Gem::Specification.new do |spec| spec.add_dependency "puppetfile-resolver", ">= 0.6.2", "< 1.0" spec.add_dependency "puppet-resource_api", ">= 1.8.1" spec.add_dependency "puppet-strings", ">= 2.3.0", "< 5.0" - spec.add_dependency "r10k", "~> 3.10" + spec.add_dependency "r10k", "~> 4.0" spec.add_dependency "ruby_smb", "~> 1.0" spec.add_dependency "terminal-table", "~> 3.0" spec.add_dependency "winrm", "~> 2.0" From 26d1949ef7f3500cbe11a71635f16e53f8ebfc69 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 27 Nov 2023 13:35:32 +0100 Subject: [PATCH 2/3] octokit: Allow newer versions --- bolt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt.gemspec b/bolt.gemspec index fe9dfe99a..bf2208a1b 100644 --- a/bolt.gemspec +++ b/bolt.gemspec @@ -67,7 +67,7 @@ Gem::Specification.new do |spec| spec.add_dependency "winrm-fs", "~> 1.3" spec.add_development_dependency "bundler", ">= 1.14" - spec.add_development_dependency "octokit", "~> 4.0" + spec.add_development_dependency "octokit", ">= 4.0", '< 9' spec.add_development_dependency "puppetlabs_spec_helper", "~> 5.0" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.0" From 11a2de4361cdc65ce2a08d1f7159390ef27ea8ed Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 27 Nov 2023 13:39:28 +0100 Subject: [PATCH 3/3] puppetlabs_spec_helper: Require 7.x The 7.0.0 release is broken, so we need to skip that. --- bolt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt.gemspec b/bolt.gemspec index bf2208a1b..8f3453ebd 100644 --- a/bolt.gemspec +++ b/bolt.gemspec @@ -68,7 +68,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", ">= 1.14" spec.add_development_dependency "octokit", ">= 4.0", '< 9' - spec.add_development_dependency "puppetlabs_spec_helper", "~> 5.0" + spec.add_development_dependency "puppetlabs_spec_helper", "~> 7.0", '>= 7.0.1' spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.0" end