Skip to content

Commit b72d0b8

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

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ end
5555
puppet_version = ENV['PUPPET_GEM_VERSION']
5656
facter_version = ENV['FACTER_GEM_VERSION']
5757
hiera_version = ENV['HIERA_GEM_VERSION']
58+
bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
5859

5960
gems = {}
6061

functions/assert_supported_bolt_version.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
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'
10+
$current_bolt_version = peadm::bolt_version()
1011
$supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
12+
out::message("Bolt version: ${current_bolt_version}")
1113
# lint:ignore:strict_indent
1214
unless $supported {
1315
fail(@("REASON"/L))
1416
This version of puppetlabs-peadm requires Bolt version ${supported_bolt_version}.
1517

16-
You are using Bolt version ${peadm::bolt_version()}.
18+
You are using Bolt version ${current_bolt_version}.
1719

1820
Please make sure you have a compatible Bolt version and try again.
1921

0 commit comments

Comments
 (0)