Skip to content

Commit 026dae4

Browse files
committed
(CAT-2281) Remove puppet 7 infrastructure
Puppet 7 is EOL. Therefore, we can remove the test infrastructure for it. This commit aims to clear up any testing/config infrastructure related to Puppet 7 and, by extension, Ruby 2.7.
1 parent 4f753d6 commit 026dae4

File tree

5 files changed

+4
-15
lines changed

5 files changed

+4
-15
lines changed

.github/workflows/ci.yml

-6
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
ruby_version:
21-
- "2.7"
2221
- "3.2"
2322
include:
24-
- ruby-version: '2.7'
25-
puppet_gem_version: '~> 7.0'
2623
- ruby_version: '3.2'
2724
puppet_gem_version: '~> 8.0' # puppet8'
2825
runs_on:
@@ -42,11 +39,8 @@ jobs:
4239
strategy:
4340
matrix:
4441
ruby_version:
45-
- "2.7"
4642
- "3.2"
4743
include:
48-
- ruby-version: '2.7'
49-
puppet_gem_version: '~> 7.0'
5044
- ruby_version: '3.2'
5145
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
5246
runs_on:

.github/workflows/nightly.yml

-6
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
ruby_version:
14-
- "2.7"
1514
- "3.2"
1615
include:
17-
- ruby-version: '2.7'
18-
puppet_gem_version: '~> 7.0'
1916
- ruby_version: '3.2'
2017
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
2118
runs_on:
@@ -34,11 +31,8 @@ jobs:
3431
strategy:
3532
matrix:
3633
ruby_version:
37-
- "2.7"
3834
- "3.2"
3935
include:
40-
- ruby-version: '2.7'
41-
puppet_gem_version: '~> 7.0'
4236
- ruby_version: '3.2'
4337
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
4438
runs_on:

.rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ inherit_from: .rubocop_todo.yml
44
inherit_gem:
55
voxpupuli-rubocop: rubocop.yml
66

7+
AllCops:
8+
TargetRubyVersion: '3.1'
9+
710
# Disabled
811
Style/ClassAndModuleChildren:
912
Enabled: false

puppet-modulebuilder.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
2929

3030
spec.add_development_dependency 'voxpupuli-rubocop', '~> 3.0.0'
3131

32-
spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
32+
spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
3333
end

spec/fixtures/module/Gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
17-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
1917
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2018
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2119
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

0 commit comments

Comments
 (0)