File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 1- modulesync_config_version : ' 2.10.0 '
1+ modulesync_config_version : ' 2.10.1 '
Original file line number Diff line number Diff line change 4848 # Otherwise we need to match the correct facter version to the used puppet version.
4949 # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
5050 # https://puppet.com/docs/puppet/5.5/about_agent.html
51+ #
52+ # The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
53+ # if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
5154 c . default_facter_version = if ENV [ 'FACTERDB_FACTS_VERSION' ]
5255 ENV [ 'FACTERDB_FACTS_VERSION' ]
5356 else
54- Gem ::Dependency . new ( '' , ENV [ 'PUPPET_VERSION' ] ) . match? ( '' , '5' ) ? '3.11.0' : '3.14.0'
57+ puppet_version = ENV [ 'PUPPET_VERSION' ] ? ENV [ 'PUPPET_VERSION' ] : Gem . loaded_specs [ 'puppet' ] . version . to_s
58+ Gem ::Dependency . new ( '' , puppet_version ) . match? ( '' , '5' ) ? '3.11.0' : '3.14.0'
5559 end
5660
5761 # Coverage generation
You can’t perform that action at this time.
0 commit comments