Merge pull request #50 from puppetlabs/maint-fix_gem_env_vars

(MAINT) Fix gem env vars
puppetlabs · Apr 13, 2023 · a0a4e41 · a0a4e41
2 parents 5fa2719 + 3daccb4
commit a0a4e41
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,11 @@ jobs:
         ruby_version:
           - "2.7"
           - "3.2"
-        puppet_gem_version:
-          - '~> 7.0'
-          - 'https://github.com/puppetlabs/puppet' # puppet8
+        include:
+          - ruby-version: '2.7'
+            puppet_gem_version: '~> 7.0'
+          - ruby_version: '3.2'
+            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
         runs_on:
           - "ubuntu-latest"
           - "windows-latest"

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -11,11 +11,13 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - "2.5"
           - "2.7"
-        puppet_gem_version:
-          - '~> 6.0'
-          - '~> 7.0'
+          - "3.2"
+        include:
+          - ruby-version: '2.7'
+            puppet_gem_version: '~> 7.0'
+          - ruby_version: '3.2'
+            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
         runs_on:
           - "ubuntu-latest"
           - "windows-latest"

diff --git a/Gemfile b/Gemfile
@@ -23,8 +23,8 @@ end
 
 group :test do
 
-  gem 'puppet', *location_for(ENV['PUPPET_LOCATION'])
-  gem 'facter', *location_for(ENV['FACTER_LOCATION'])
+  gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+  gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 
   gem 'json_pure'
   gem 'sync'