Skip to content

Commit a0a4e41

Browse files
Merge pull request #50 from puppetlabs/maint-fix_gem_env_vars
(MAINT) Fix gem env vars
2 parents 5fa2719 + 3daccb4 commit a0a4e41

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
ruby_version:
1515
- "2.7"
1616
- "3.2"
17-
puppet_gem_version:
18-
- '~> 7.0'
19-
- 'https://github.com/puppetlabs/puppet' # puppet8
17+
include:
18+
- ruby-version: '2.7'
19+
puppet_gem_version: '~> 7.0'
20+
- ruby_version: '3.2'
21+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
2022
runs_on:
2123
- "ubuntu-latest"
2224
- "windows-latest"

.github/workflows/nightly.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
ruby_version:
14-
- "2.5"
1514
- "2.7"
16-
puppet_gem_version:
17-
- '~> 6.0'
18-
- '~> 7.0'
15+
- "3.2"
16+
include:
17+
- ruby-version: '2.7'
18+
puppet_gem_version: '~> 7.0'
19+
- ruby_version: '3.2'
20+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
1921
runs_on:
2022
- "ubuntu-latest"
2123
- "windows-latest"

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ end
2323

2424
group :test do
2525

26-
gem 'puppet', *location_for(ENV['PUPPET_LOCATION'])
27-
gem 'facter', *location_for(ENV['FACTER_LOCATION'])
26+
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
27+
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
2828

2929
gem 'json_pure'
3030
gem 'sync'

0 commit comments

Comments
 (0)