Skip to content

Commit

Permalink
[puppetlabs#1121] Pin cri to 2.15.10
Browse files Browse the repository at this point in the history
This commit pins cri to 2.15.10 because they dropped support for Ruby 2.3 and
2.4 in cri 2.15.11. This allows us to maintain support for those Ruby versions,
since we still support them in the Puppet 6 stream. We plan to loosen this
dependency and drop support for Ruby < 2.5 in the next major release of r10k.
  • Loading branch information
mwaggett committed Mar 17, 2021
1 parent ff1a1a6 commit 5e01915
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Unreleased
- Add 'strip\_component' environment source configuration setting, to allow deploying Git branches named like "env/production" as Puppet environments named like "production". [#1128](https://github.com/puppetlabs/r10k/pull/1128)
- A warning will be emitted when the user supplies conflicting arguments to module definitions in a Puppetfile, such as when specifying both :commit and :branch [#1130](https://github.com/puppetlabs/r10k/pull/1130)
- Add optional standard module and environment specification interface: name, type, source, version. These options can be used when specifying environments and/or modules in a yaml/exec source, as well as when specifying modules in a Puppetfile. Providing the standard interface simplifies integrations with external services [#1131](https://github.com/puppetlabs/r10k/pull/1131)
- Pin cri to 2.15.10 to maintain support for Ruby 2.3 and 2.4.

3.8.0
-----
Expand Down
2 changes: 1 addition & 1 deletion r10k.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.license = 'Apache-2.0'

s.add_dependency 'colored2', '3.1.2'
s.add_dependency 'cri', ['>= 2.15.10', '< 3.0.0']
s.add_dependency 'cri', '2.15.10'

s.add_dependency 'log4r', '1.1.10'
s.add_dependency 'multi_json', '~> 1.10'
Expand Down

0 comments on commit 5e01915

Please sign in to comment.