Skip to content

Commit 3b333ea

Browse files
authored
Merge pull request #660 from mhashizume/PA-5368/master/ruby-2_7_8
(PA-5368) Bump Ruby 2.7 component to 2.7.8
2 parents fb421cc + c1a3171 commit 3b333ea

10 files changed

+12
-12
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ end
1313
gem 'artifactory'
1414
gem 'vanagon', *location_for(ENV['VANAGON_LOCATION'] || '~> 0.28')
1515
gem 'packaging', *location_for(ENV['PACKAGING_LOCATION'] || '~> 0.105')
16-
gem 'rake', '~> 12.0'
16+
gem 'rake', '~> 13.0'
1717

1818
group(:development, optional: true) do
1919
gem 'highline', require: false

configs/components/ruby-2.7-augeas.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component 'ruby-2.7-augeas' do |pkg, settings, platform|
2-
expected_ruby_version = '2.7.7'
2+
expected_ruby_version = '2.7.8'
33

44
unless settings[:ruby_version] == expected_ruby_version
55
unless settings.key?(:additional_rubies) && settings[:additional_rubies].key?(expected_ruby_version)

configs/components/ruby-2.7-selinux.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component 'ruby-2.7-selinux' do |pkg, settings, platform|
2-
expected_ruby_version = '2.7.7'
2+
expected_ruby_version = '2.7.8'
33

44
unless settings[:ruby_version] == expected_ruby_version
55
unless settings.key?(:additional_rubies) && settings[:additional_rubies].key?(expected_ruby_version)

configs/components/ruby-2.7-stomp.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component 'ruby-2.7-stomp' do |pkg, settings, platform|
2-
expected_ruby_version = '2.7.7'
2+
expected_ruby_version = '2.7.8'
33

44
unless settings[:ruby_version] == expected_ruby_version
55
unless settings.key?(:additional_rubies) && settings[:additional_rubies].key?(expected_ruby_version)

configs/components/ruby-2.7.7.rb renamed to configs/components/ruby-2.7.8.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
component 'ruby-2.7.7' do |pkg, settings, platform|
2-
pkg.version '2.7.7'
3-
pkg.sha256sum 'e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90'
1+
component 'ruby-2.7.8' do |pkg, settings, platform|
2+
pkg.version '2.7.8'
3+
pkg.sha256sum 'c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0'
44

55
# rbconfig-update is used to munge rbconfigs after the fact.
66
pkg.add_source("file://resources/files/ruby/rbconfig-update.rb")

configs/projects/agent-runtime-7.x.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project 'agent-runtime-7.x' do |proj|
22

33
# Set preferred component versions if they differ from defaults:
4-
proj.setting :ruby_version, '2.7.7'
4+
proj.setting :ruby_version, '2.7.8'
55
proj.setting :rubygem_deep_merge_version, '1.2.2'
66
proj.setting :rubygem_fast_gettext_version, '1.1.2'
77
proj.setting :rubygem_gettext_version, '3.2.2'

configs/projects/bolt-runtime.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project 'bolt-runtime' do |proj|
22
# Used in component configurations to conditionally include dependencies
33
proj.setting(:runtime_project, 'bolt')
4-
proj.setting(:ruby_version, '2.7.7')
4+
proj.setting(:ruby_version, '2.7.8')
55
proj.setting(:openssl_version, '1.1.1')
66
proj.setting(:rubygem_net_ssh_version, '6.1.0')
77
proj.setting(:augeas_version, '1.11.0')

configs/projects/pdk-runtime.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
proj.setting(:includedir, File.join(proj.prefix, "include"))
5353
proj.setting(:bindir, File.join(proj.prefix, "bin"))
5454

55-
proj.setting(:ruby_version, "2.7.7")
55+
proj.setting(:ruby_version, "2.7.8")
5656
proj.setting(:ruby_api, "2.7.0")
5757

5858
# this is the latest puppet that will be installed into the default ruby version above

configs/projects/pe-installer-runtime-2021.7.x.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project 'pe-installer-runtime-2021.7.x' do |proj|
22
# Used in component configurations to conditionally include dependencies
33
proj.setting(:runtime_project, 'pe-installer')
4-
proj.setting(:ruby_version, '2.7.7')
4+
proj.setting(:ruby_version, '2.7.8')
55
proj.setting(:augeas_version, '1.11.0')
66
# We need to explicitly define 1.1.1k here to avoid
77
# build dep conflicts between openssl-1.1.1 needed by curl

configs/projects/pe-installer-runtime-main.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project 'pe-installer-runtime-main' do |proj|
22
# Used in component configurations to conditionally include dependencies
33
proj.setting(:runtime_project, 'pe-installer')
4-
proj.setting(:ruby_version, '2.7.7')
4+
proj.setting(:ruby_version, '2.7.8')
55
proj.setting(:augeas_version, '1.11.0')
66
# We need to explicitly define 1.1.1k here to avoid
77
# build dep conflicts between openssl-1.1.1 needed by curl

0 commit comments

Comments
 (0)