Skip to content

Commit

Permalink
Require Ruby 3.1
Browse files Browse the repository at this point in the history
This allows us to use the latest minitar and forge_ruby dependencies.
  • Loading branch information
bastelfreak committed Sep 20, 2024
1 parent c8ec669 commit cceff7b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
with: # This doesn't seem to work unless we point directly to the secrets
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Set up Ruby 2.6
- name: Set up Ruby 3.1
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
ruby-version: 3.1
- run: gem install bundler
- uses: actions/checkout@v3
- name: Set up QEMU
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/rspec_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ jobs:
strategy:
matrix:
cfg:
- {os: ubuntu-latest, ruby: 2.6}
- {os: ubuntu-latest, ruby: 2.7}
- {os: ubuntu-latest, ruby: 3.1}
- {os: ubuntu-latest, ruby: 3.2}
- {os: ubuntu-latest, ruby: jruby-9.3}
- {os: ubuntu-latest, ruby: jruby-9.4}
- {os: windows-latest, ruby: 2.6}
- {os: windows-latest, ruby: 3.2}

runs-on: ${{ matrix.cfg.os }}
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CHANGELOG
Unreleased
----------

Require Ruby 3.1 [#1402](https://github.com/puppetlabs/r10k/pull/1402)

4.1.0
-----

Expand Down
2 changes: 1 addition & 1 deletion lib/r10k/tarball.rb
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def cache_checksum
def each_tarball_entry(&block)
File.open(cache_path, 'rb') do |file|
Zlib::GzipReader.wrap(file) do |reader|
Archive::Tar::Minitar::Input.each_entry(reader) do |entry|
Minitar::Input.each_entry(reader) do |entry|
yield entry
end
end
Expand Down
8 changes: 4 additions & 4 deletions r10k.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ Gem::Specification.new do |s|
dynamic environments.
DESCRIPTION

s.required_ruby_version = '>= 2.6.0'
s.required_ruby_version = '>= 3.1.0'

s.license = 'Apache-2.0'

s.add_dependency 'colored2', '3.1.2'
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', '>= 4.1', '< 6'
s.add_dependency 'puppet_forge', '~> 6.0'

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions spec/shared-contexts/git-fixtures.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'archive/tar/minitar'
require 'minitar'
require 'tmpdir'

shared_context "Git integration" do
Expand Down Expand Up @@ -26,7 +26,7 @@ def remote_path
end

def populate_remote_path
Archive::Tar::Minitar.unpack(File.join(fixture_path, 'puppet-boolean-bare.tar'), remote_path)
Minitar.unpack(File.join(fixture_path, 'puppet-boolean-bare.tar'), remote_path)
end

def clear_remote_path
Expand Down

0 comments on commit cceff7b

Please sign in to comment.