From 29b38d12972674a008c41b6d0d4e89ec751e982d Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Mon, 4 Mar 2024 14:07:43 -0800
Subject: [PATCH 1/2] Correct beaker-puppet Ruby constraint

---
 .sync.yml | 2 +-
 Gemfile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index a4773b96..2da9b08d 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -28,7 +28,7 @@ Gemfile:
       - gem: beaker-puppet
         from_env: BEAKER_PUPPET_VERSION
         version: '~> 3.0'
-        condition: Gem::Requirement.create('< 3.1.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+        condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
       - gem: beaker-module_install_helper
       - gem: beaker-puppet_install_helper
       - gem: nokogiri
diff --git a/Gemfile b/Gemfile
index a3b4de66..34a24293 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ group :development do
   gem "beaker-docker", '~> 0.3',                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3.0') if Gem::Requirement.create('< 3.1.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  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-module_install_helper",                                          require: false
   gem "beaker-puppet_install_helper",                                          require: false
   gem "nokogiri",                                                              require: false

From 6e837d0f25064d902ef82962871f8d0cc44d6eea Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Mon, 4 Mar 2024 14:11:14 -0800
Subject: [PATCH 2/2] Make Vox Rake tasks conditional

---
 .sync.yml | 3 ++-
 Rakefile  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 2da9b08d..f7a114bb 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -65,4 +65,5 @@ Rakefile:
   extra_disabled_lint_checks:
     - puppet_url_without_modules
   requires:
-    - voxpupuli/acceptance/rake
+    - require: voxpupuli/acceptance/rake
+      conditional: Gem.loaded_specs.key? 'voxpupuli-acceptance'
diff --git a/Rakefile b/Rakefile
index fac9fb85..dceca8fb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
 require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
-require 'voxpupuli/acceptance/rake'
+require 'voxpupuli/acceptance/rake' if Gem.loaded_specs.key? 'voxpupuli-acceptance'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"