Skip to content

Commit bccc7cb

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 c5d70da commit bccc7cb

File tree

6 files changed

+3
-18
lines changed

6 files changed

+3
-18
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 6 deletions
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_version: '~> 7.0'
2623
- ruby_version: '3.2'
2724
puppet_version: '~> 8.0'
2825
name: "spec (ruby ${{ matrix.ruby_version }} | puppet ${{ matrix.puppet_version }})"
@@ -38,11 +35,8 @@ jobs:
3835
strategy:
3936
matrix:
4037
ruby_version:
41-
- "2.7"
4238
- "3.2"
4339
include:
44-
- ruby-version: '2.7'
45-
puppet_version: '~> 7.0'
4640
- ruby_version: '3.2'
4741
puppet_version: '~> 8.0'
4842
runs_on:

.github/workflows/custom_acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
ruby_version:
1414
description: "The target Ruby version."
1515
required: false
16-
default: "2.7"
16+
default: "3.1"
1717
type: "string"
1818
puppet_version:
1919
description: "The target Puppet version."

.github/workflows/nightly.yml

Lines changed: 0 additions & 6 deletions
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_version: '~> 7.0'
1916
- ruby_version: '3.2'
2017
puppet_version: '~> 8.0'
2118
name: "spec (ruby ${{ matrix.ruby_version }} | puppet ${{ matrix.puppet_version }})"
@@ -30,11 +27,8 @@ jobs:
3027
strategy:
3128
matrix:
3229
ruby_version:
33-
- "2.7"
3430
- "3.2"
3531
include:
36-
- ruby-version: '2.7'
37-
puppet_version: '~> 7.0'
3832
- ruby_version: '3.2'
3933
puppet_version: '~> 8.0'
4034
runs_on:

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AllCops:
1212
- vendor/bundle/**/*
1313
NewCops: enable
1414
SuggestExtensions: false
15-
TargetRubyVersion: '2.7'
15+
TargetRubyVersion: '3.1'
1616

1717
# Disabled
1818
Style/ClassAndModuleChildren:

Gemfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ 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))
22-
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2320
gem "deep_merge", '~> 1.0', require: false
2421
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
2522
gem "facterdb", '~> 1.18', require: false

ruby-pwsh.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
3232
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
3333
spec.require_paths = ['lib']
3434

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

0 commit comments

Comments
 (0)