Skip to content

Commit 82cb25d

Browse files
(PE-42498) Update to support Bolt v5
1 parent 67899f0 commit 82cb25d

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

.github/workflows/test-add-compiler-matrix.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
BOLT_GEM: true
3333
BOLT_DISABLE_ANALYTICS: true
3434
LANG: en_US.UTF-8
35+
PUPPET_FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_API_TOKEN }}
36+
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_API_TOKEN }}
3537
strategy:
3638
fail-fast: false
3739
matrix:

Gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ gems = {}
6060

6161
gems['puppet'] = location_for(puppet_version)
6262

63+
#bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
64+
65+
# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
66+
# Otherwise, do as before and use location_for to fetch gems from the default source
67+
if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
68+
#gems['bolt'] = [bolt_version || '~> 5.0', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
69+
else
70+
#gems['bolt'] = location_for(bolt_version)
71+
end
72+
6373
# If facter or hiera versions have been specified via the environment
6474
# variables
6575
gems['facter'] = location_for(facter_version) if facter_version

functions/assert_supported_bolt_version.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
function peadm::assert_supported_bolt_version (
77
# No arguments
88
) >> Struct[{ 'supported' => Boolean }] {
9-
$supported_bolt_version = '>= 3.17.0 < 5.0.0'
9+
$supported_bolt_version = '>= 3.17.0 < 6.0.0'
1010
$supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
1111
# lint:ignore:strict_indent
1212
unless $supported {

0 commit comments

Comments
 (0)