(MAINT) Testing versions

puppetlabs · May 25, 2023 · fe53b86 · fe53b86
1 parent aa393ac
commit fe53b86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,9 +34,9 @@ jobs:
           - "3.2"
         include:
           - ruby_version: '2.7'
-            puppet_version: '~> 7.0'
+            puppet_version: '7.0'
           - ruby_version: '3.2'
-            puppet_version: '~> 8.0'          
+            puppet_version: '8.0'          
     name: "acceptance (ruby ${{ matrix.ruby_version }} | ${{ matrix.os }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
     secrets: "inherit"

diff --git a/Rakefile b/Rakefile
@@ -50,7 +50,8 @@ end
 namespace :acceptance do
   desc 'Run acceptance tests against current code'
 
-  ENV['PDK_PUPPET_VERSION'] = ENV.fetch('PUPPET_VERSION', '7')
+  ENV['PDK_PUPPET_VERSION'] = RUBY_VERSION.split('.')[0].include?('3') ? '8' : '7'
+
   RSpec::Core::RakeTask.new(:local) do |t|
     t.rspec_opts = '--tag ~package' # Exclude package specific examples
     t.pattern = 'spec/acceptance/**/*_spec.rb'