temp breakout

Author: chelnak

.github/workflows/ci.yml

@@ -12,13 +12,19 @@ on:
   workflow_dispatch:
 
 jobs:
+
   ci:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@maint-generic_gem_task"
+    secrets: "inherit"
+
+  acceptance:
+    needs: "ci"
     strategy:
       matrix:
         puppet:
           - "puppet6"
           - "puppet7"
-    uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@maint-generic_gem_task"
+    uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@maint-generic_gem_task"
     secrets: "inherit"
     with:
       target: ${{ matrix.target }}

Rakefile

@@ -2,45 +2,14 @@
 
 if Bundler.rubygems.find_name('puppet_litmus').any?
   require 'puppet_litmus/rake_tasks'
-
-  # This is a _really_ horrible monkey-patch to fix up https://github.com/puppetlabs/bolt/issues/1614
-  # Based on resolution https://github.com/puppetlabs/bolt/pull/1620
-  # This can be removed once this is fixed, released into Bolt and into Litmus
-  require 'bolt_spec/run'
-  module BoltSpec
-    module Run
-      class BoltRunner
-        class << self
-          alias_method :original_with_runner, :with_runner
-        end
-
-        def self.with_runner(config_data, inventory_data)
-          original_with_runner(deep_duplicate_object(config_data), deep_duplicate_object(inventory_data)) { |runner| yield runner }
-        end
-
-        # From https://github.com/puppetlabs/pdk/blob/main/lib/pdk/util.rb
-        # Workaround for https://github.com/puppetlabs/bolt/issues/1614
-        def self.deep_duplicate_object(object)
-          if object.is_a?(Array)
-            object.map { |item| deep_duplicate_object(item) }
-          elsif object.is_a?(Hash)
-            hash = object.dup
-            hash.each_pair { |key, value| hash[key] = deep_duplicate_object(value) }
-            hash
-          else
-            object
-          end
-        end
-      end
-    end
-  end
 end
 
 require 'puppetlabs_spec_helper/tasks/fixtures'
 require 'bundler/gem_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.exclude_pattern = "spec/acceptance/**/*.rb"
 end