Skip to content

Commit 063b380

Browse files
committed
Require Ruby 3.1 or newer
Ruby 3.0 and older are EoL. Also latest PathSpec and minitar dropped support for Ruby 3.0.
1 parent 3fbb209 commit 063b380

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
ruby_version:
21-
- "2.7"
21+
- "3.3"
2222
- "3.2"
23-
include:
24-
- ruby-version: '2.7'
25-
puppet_gem_version: '~> 7.0'
26-
- ruby_version: '3.2'
27-
puppet_gem_version: '~> 8.0' # puppet8'
23+
- "3.1"
24+
puppet_gem_version:
25+
- '~> 8.0'
2826
runs_on:
2927
- "ubuntu-latest"
3028
- "windows-latest"
29+
include:
30+
- ruby_version: '3.1'
31+
puppet_gem_version: '~> 7.0'
32+
runs_on: 'ubuntu-latest'
3133
name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
3234
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
3335
secrets: "inherit"
@@ -42,16 +44,19 @@ jobs:
4244
strategy:
4345
matrix:
4446
ruby_version:
45-
- "2.7"
47+
- "3.3"
4648
- "3.2"
47-
include:
48-
- ruby-version: '2.7'
49-
puppet_gem_version: '~> 7.0'
50-
- ruby_version: '3.2'
51-
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
49+
- "3.1"
50+
puppet_gem_version:
51+
- '~> 8.0'
52+
- 'https://github.com/puppetlabs/puppet'
5253
runs_on:
5354
- "ubuntu-latest"
5455
- "windows-latest"
56+
include:
57+
- ruby_version: '3.1'
58+
puppet_gem_version: '~> 7.0'
59+
runs_on: 'ubuntu-latest'
5560
name: "acceptance (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
5661
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
5762
secrets: "inherit"

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ inherit_gem:
77
# Disabled
88
Style/ClassAndModuleChildren:
99
Enabled: false
10+
11+
AllCops:
12+
TargetRubyVersion: '3.1'

puppet-modulebuilder.gemspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ Gem::Specification.new do |spec|
2525
spec.require_paths = ['lib']
2626
# minitar and pathspec is required for building Puppet modules
2727
spec.add_runtime_dependency 'minitar', '~> 0.9'
28-
spec.add_runtime_dependency 'pathspec', '>= 0.2.1', '< 3.0.0'
28+
spec.add_runtime_dependency 'pathspec', '~> 2.1'
2929

3030
spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
31-
32-
spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
31+
spec.required_ruby_version = '>= 3.1'
3332
end

0 commit comments

Comments
 (0)