Skip to content

Commit 4f496fa

Browse files
authored
Merge pull request #935 from alex501212/r10k-bump
Updated rubygem-r10k from 3.16.2 to 4.1.0
2 parents 86d6e2d + f2e8c40 commit 4f496fa

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed
Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
component 'rubygem-faraday-net_http_persistent' do |pkg, settings, platform|
2-
pkg.version '1.2.0'
3-
pkg.md5sum 'e13bafd2297cbf703e0385e142c9ce62'
2+
version = settings[:rubygem_faraday_net_http_persistent_version] || '1.2.0'
3+
4+
case version
5+
when '1.2.0'
6+
pkg.version '1.2.0'
7+
pkg.md5sum 'e13bafd2297cbf703e0385e142c9ce62'
8+
when '2.3.0'
9+
pkg.version '2.3.0'
10+
pkg.md5sum 'b8003472ed288c44021dcfed574353b2'
11+
else
12+
raise "rubygem-faraday-net_http_persistent version #{version} is not supported"
13+
end
414

515
instance_eval File.read('configs/components/_base-rubygem.rb')
616
end
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-orchestrator_client' do |pkg, settings, platform|
2-
pkg.version '0.7.0'
3-
pkg.md5sum '03fb7c2fb2d8d407b638e31761bc0d92'
2+
pkg.version '0.7.1'
3+
pkg.md5sum '177686e31c134ae9fdee25ba8c0404a0'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-r10k.rb

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
component 'rubygem-r10k' do |pkg, settings, platform|
2-
pkg.version '3.16.2'
3-
pkg.sha256sum '9775a726ba94a543bf49952b10dcd23690a54f5d2a361746b78b1292abe32eb9'
2+
version = settings[:rubygem_r10k_version] || '3.16.2'
3+
4+
case version
5+
when '3.16.2'
6+
pkg.version '3.16.2'
7+
pkg.sha256sum '9775a726ba94a543bf49952b10dcd23690a54f5d2a361746b78b1292abe32eb9'
8+
when '4.1.0'
9+
pkg.version '4.1.0'
10+
pkg.sha256sum '64e5b9e1a6cbb4006c96477d8c34ce589fe1c278117311f452d9f30b9cc86e4c'
11+
else
12+
raise "rubygem-r10k version #{version} is not supported"
13+
end
414

515
instance_eval File.read('configs/components/_base-rubygem.rb')
616
end

configs/projects/bolt-runtime.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
proj.setting(:augeas_version, '1.14.1')
1010
# TODO: Can runtime projects use these updated versions?
1111
proj.setting(:rubygem_deep_merge_version, '1.2.2')
12+
proj.setting(:rubygem_puppet_forge_version, '5.0.4')
13+
proj.setting(:rubygem_faraday_version, '2.12.0')
14+
proj.setting(:rubygem_faraday_net_http_version, '3.3.0')
15+
proj.setting(:rubygem_faraday_net_http_persistent_version, '2.3.0')
16+
proj.setting(:rubygem_r10k_version, '4.1.0')
1217
proj.setting(:rubygem_puppet_version, '8.10.0')
1318

1419
platform = proj.get_platform
@@ -158,7 +163,7 @@
158163
proj.component 'rubygem-faraday-patron'
159164
proj.component 'rubygem-faraday-rack'
160165
proj.component 'rubygem-faraday-retry'
161-
proj.component 'rubygem-faraday_middleware'
166+
proj.component 'rubygem-faraday-follow_redirects'
162167
proj.component 'rubygem-ruby2_keywords'
163168

164169
# Core dependencies

0 commit comments

Comments
 (0)