File tree Expand file tree Collapse file tree 5 files changed +10
-11
lines changed Expand file tree Collapse file tree 5 files changed +10
-11
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ Gem::Specification.new do |s|
18
18
s . version = mdata ? mdata [ 1 ] : version
19
19
20
20
s . required_rubygems_version = Gem ::Requirement . new ( "> 1.3.1" )
21
+ # Bump this in PUP-11716
21
22
s . required_ruby_version = Gem ::Requirement . new ( ">= 2.5.0" )
22
23
s . authors = [ "Puppet Labs" ]
23
24
s . date = "2012-08-17"
Original file line number Diff line number Diff line change 16
16
strategy :
17
17
matrix :
18
18
cfg :
19
- - {check: rubocop, os: ubuntu-latest, ruby: 2.5 }
20
- - {check: commits, os: ubuntu-latest, ruby: 2.5 }
21
- - {check: warnings, os: ubuntu-latest, ruby: 2.5 }
19
+ - {check: rubocop, os: ubuntu-latest, ruby: 2.7 }
20
+ - {check: commits, os: ubuntu-latest, ruby: 2.7 }
21
+ - {check: warnings, os: ubuntu-latest, ruby: 2.7 }
22
22
23
23
runs-on : ${{ matrix.cfg.os }}
24
24
steps :
Original file line number Diff line number Diff line change @@ -16,15 +16,11 @@ jobs:
16
16
strategy :
17
17
matrix :
18
18
cfg :
19
- - {os: ubuntu-latest, ruby: '2.5'}
20
- - {os: ubuntu-latest, ruby: '2.6'}
21
19
- {os: ubuntu-latest, ruby: '2.7'}
22
20
- {os: ubuntu-latest, ruby: '3.0'}
23
21
- {os: ubuntu-20.04, ruby: '3.2'} # openssl 1.1.1
24
22
- {os: ubuntu-22.04, ruby: '3.2'} # openssl 3
25
23
- {os: ubuntu-latest, ruby: 'jruby-9.2.21.0'}
26
- - {os: windows-2019, ruby: '2.5'}
27
- - {os: windows-2019, ruby: '2.6'}
28
24
- {os: windows-2019, ruby: '2.7'}
29
25
- {os: windows-2019, ruby: '3.0'}
30
26
- {os: windows-2019, ruby: '3.2'} # openssl 3
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ gem_executables: 'puppet'
15
15
gem_default_executables : ' puppet'
16
16
gem_license : ' Apache-2.0'
17
17
gem_forge_project : ' puppet'
18
- gem_required_ruby_version : ' >= 2.5 .0'
18
+ gem_required_ruby_version : ' >= 2.7 .0'
19
19
gem_required_rubygems_version : ' > 1.3.1'
20
20
gem_runtime_dependencies :
21
21
facter : ['> 2.0.1', '< 5']
Original file line number Diff line number Diff line change 1
1
require_relative 'puppet/version'
2
2
require_relative 'puppet/concurrent/synchronized'
3
3
4
- if Gem ::Version . new ( RUBY_VERSION . dup ) < Gem ::Version . new ( "2.5.0" )
5
- raise LoadError , "Puppet #{ Puppet . version } requires Ruby 2.5.0 or greater, found Ruby #{ RUBY_VERSION . dup } ."
4
+ # Update JRuby version constraints in PUP-11716
5
+ if !defined? ( JRUBY_VERSION ) && Gem ::Version . new ( RUBY_VERSION . dup ) < Gem ::Version . new ( "2.7.0" )
6
+ raise LoadError , "Puppet #{ Puppet . version } requires Ruby 2.7.0 or greater, found Ruby #{ RUBY_VERSION . dup } ."
6
7
end
7
8
8
- Puppet ::OLDEST_RECOMMENDED_RUBY_VERSION = '2.5 .0'
9
+ Puppet ::OLDEST_RECOMMENDED_RUBY_VERSION = '2.7 .0'
9
10
10
11
$LOAD_PATH. extend ( Puppet ::Concurrent ::Synchronized )
11
12
@@ -130,6 +131,7 @@ def self.run_mode
130
131
131
132
# Now that settings are loaded we have the code loaded to be able to issue
132
133
# deprecation warnings. Warn if we're on a deprecated ruby version.
134
+ # Update JRuby version constraints in PUP-11716
133
135
if Gem ::Version . new ( RUBY_VERSION . dup ) < Gem ::Version . new ( Puppet ::OLDEST_RECOMMENDED_RUBY_VERSION )
134
136
Puppet . deprecation_warning ( _ ( "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions." ) % { version : RUBY_VERSION } )
135
137
end
You can’t perform that action at this time.
0 commit comments