Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support more minitar versions & prep for r10k 5.0 #major #1408

Closed
wants to merge 4 commits into from
Closed

Support more minitar versions & prep for r10k 5.0 #major #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcf59b6
(maint) Support different major versions of minitar
justinstoller Oct 30, 2024
5eec39c
(maint) Prepare for #major release of r10k 5.0.0
justinstoller Oct 30, 2024
f3a8226
Tighten minitar version range in r10k.gemspec
justinstoller Oct 30, 2024
458132c
Tighten puppet_forge version range in r10k.gemspec
justinstoller Oct 30, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.mkd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ CHANGELOG
Unreleased
----------

5.0.0
-----

- Add Ruby 3.3 to CI [#1403](https://github.com/puppetlabs/r10k/pull/1403)
- Require Ruby 3.1 [#1402](https://github.com/puppetlabs/r10k/pull/1402)
- Support minitar gem > 1.0. [#1407](https://github.com/puppetlabs/r10k/pull/1407)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shoot, this PR ended up being 1408, I guess I missed 1407.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To prevent this in the future I raised #1404 some time ago :D


4.1.0
-----
Expand Down
2 changes: 1 addition & 1 deletion lib/r10k/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ module R10K
# When updating to a new major (X) or minor (Y) version, include `#major` or
# `#minor` (respectively) in your commit message to trigger the appropriate
# release. Otherwise, a new patch (Z) version will be released.
VERSION = '4.1.0'
VERSION = '5.0.0'
end
10 changes: 2 additions & 8 deletions r10k.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,15 @@ Gem::Specification.new do |s|

s.add_dependency 'colored2', '~> 4.0'
s.add_dependency 'cri', '>= 2.15.10'

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

s.add_dependency 'puppet_forge', '~> 6.0'

s.add_dependency 'puppet_forge', '>= 4.1.0', '< 7'
s.add_dependency 'gettext-setup', '>=0.24', '<2.0'

s.add_dependency 'jwt', '>= 2.2.3', '< 3'
s.add_dependency 'minitar', '~> 1.0', '>= 1.0.2'
s.add_dependency 'minitar', '>= 0.9', '< 2'

s.add_development_dependency 'rspec', '~> 3.1'

s.add_development_dependency 'rake'

s.add_development_dependency 'yard', '~> 0.9.11'

s.files = %x[git ls-files].split($/).reject { |f| f.match(%r{^spec}) }
Expand Down
Loading