Skip to content
Snippets Groups Projects
Unverified Commit 069d1e89 authored by Gavin Didrichsen's avatar Gavin Didrichsen
Browse files

Only pin to the puppetcore versions.


Since the puppet_version and facter_version are not always going to be version contrains (they can also be a git URL), then I'm removing this flexible check and pinning only to the latest puppetcore gems.  If flexible puppet and facter gemsources are need via https or git, then remove the PUPPET_FORGE_TOKEN and use PUPPET_GEM_VERSION and/or FACTER_GEM_VERSION instead.

Signed-off-by: default avatarGavin Didrichsen <gavin.didrichsen@gmail.com>
parent a4c6aee9
No related branches found
No related tags found
No related merge requests found
...@@ -112,8 +112,8 @@ hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil) ...@@ -112,8 +112,8 @@ hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet # If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
# Otherwise, do as before and use location_for to fetch gems from the default source # Otherwise, do as before and use location_for to fetch gems from the default source
if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty? if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
gems['puppet'] = [puppet_version || '~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }] gems['puppet'] = ['~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
gems['facter'] = [facter_version || '~> 4.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }] gems['facter'] = ['~> 4.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
else else
gems['puppet'] = location_for(puppet_version) gems['puppet'] = location_for(puppet_version)
gems['facter'] = location_for(facter_version) if facter_version gems['facter'] = location_for(facter_version) if facter_version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment