Skip to content

Commit 9969230

Browse files
committed
(maint) Install Puppet 7 from Puppet Core
Currently, Phoenix modules install Puppet 8 gems from Puppet Core, but Puppet 7 gems from Rubygems. The logic currently used in Phoenix module gemfiles to determine whether to install from Puppet Core differs slightly from that used in the latest PDK (3.5.1) template, causing authentication errors when attempting to install Puppet 7 gems. The current workflow with the new PDK 3.5.1 gemfile logic attempts to install Puppet 7 gems from Puppet Core without passing on the proper credentials. I attempted to bridge the gap with 1499ab9, but I misunderstood how Ruby ingested variables from GitHub Actions. This commit updates unit tests with released Puppet gems to use Puppet Core gems for Puppet 7.
1 parent dc9bd59 commit 9969230

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.github/workflows/unit_tests_with_released_puppet_gem.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ jobs:
1717
include:
1818
- puppet_version: '7'
1919
ruby: '2.7'
20-
puppet_forge_token: ${{ null }}
2120
- puppet_version: '8'
2221
ruby: '3.1'
23-
puppet_forge_token: 'YES'
2422

2523
- os: 'ubuntu-latest'
2624
os_type: 'Linux'
@@ -46,8 +44,8 @@ jobs:
4644
ruby-version: ${{ matrix.ruby }}
4745
bundler-cache: true
4846
env:
49-
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ matrix.puppet_version != '7' && secrets.PUPPET_FORGE_TOKEN_PUBLIC || '' }}
50-
PUPPET_FORGE_TOKEN: ${{ matrix.puppet_forge_token }}
47+
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_TOKEN_PUBLIC || '' }}
48+
PUPPET_FORGE_TOKEN: 'YES'
5149

5250
- name: Run unit tests
5351
run: bundle exec rake parallel_spec

0 commit comments

Comments
 (0)