Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/test-add-compiler-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
BOLT_GEM: true
BOLT_DISABLE_ANALYTICS: true
LANG: en_US.UTF-8
PUPPET_FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_API_TOKEN }}
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_API_TOKEN }}
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ end
puppet_version = ENV['PUPPET_GEM_VERSION']
facter_version = ENV['FACTER_GEM_VERSION']
hiera_version = ENV['HIERA_GEM_VERSION']
bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)

gems = {}

Expand Down
6 changes: 4 additions & 2 deletions functions/assert_supported_bolt_version.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
function peadm::assert_supported_bolt_version (
# No arguments
) >> Struct[{ 'supported' => Boolean }] {
$supported_bolt_version = '>= 3.17.0 < 5.0.0'
$supported_bolt_version = '>= 3.17.0 < 6.0.0'
$current_bolt_version = peadm::bolt_version()
$supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))

# lint:ignore:strict_indent
unless $supported {
fail(@("REASON"/L))
This version of puppetlabs-peadm requires Bolt version ${supported_bolt_version}.

You are using Bolt version ${peadm::bolt_version()}.
You are using Bolt version ${current_bolt_version}.

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

Expand Down
Loading