Skip to content

Commit 15a50e2

Browse files
committed
Bump minitar 1.0.1 for puppet 8
Minitar 1.x is not backwards compatible with 0.9, so only make this change in agent-runtime-main for now. Projects that depend on minitar and puppet will need to be made compatible with minitar 1.x before bumping their puppet dependency in puppet-runtime. And when they do bump puppet, they should bump minitar too. I added a reminder for the latter part. This applies to: bolt-runtime pe-bolt-server-runtime-main pe-installer-runtime-main pdk-runtime depends on minitar, but not puppet. When a new version of puppet is released that depends on minitar 1.x, then modules created using an older version of the pdk, will pull in the latest puppet, but have an incompatible minitar version.
1 parent 515c138 commit 15a50e2

5 files changed

+30
-3
lines changed

configs/components/rubygem-minitar.rb

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
component 'rubygem-minitar' do |pkg, settings, platform|
2-
pkg.version '0.9'
3-
pkg.md5sum '4ab2c278183c9a83f3ad97066c381d84'
2+
version = settings[:rubygem_minitar_version] || '0.9'
3+
pkg.version version
4+
5+
case version
6+
when '1.0.1'
7+
pkg.sha256sum 'ba258663f25a3e89ca55bfa2680ce35866d5d2d2998c14d2d2342650f5499705'
8+
when '0.9'
9+
pkg.md5sum '4ab2c278183c9a83f3ad97066c381d84'
10+
else
11+
raise "rubygem-minitar version #{version} has not been configured; Cannot continue."
12+
end
413

514
instance_eval File.read('configs/components/_base-rubygem.rb')
6-
end
15+
end

configs/projects/agent-runtime-main.rb

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
proj.setting :rubygem_deep_merge_version, '1.2.2'
66
proj.setting :rubygem_highline_version, '3.0.1'
77
proj.setting :rubygem_hocon_version, '1.4.0'
8+
proj.setting :rubygem_minitar_version, '1.0.1'
89
proj.setting :rubygem_net_ssh_version, '7.2.3'
910

1011
# Solaris and AIX depend on libedit which breaks augeas compliation starting with 1.13.0

configs/projects/bolt-runtime.rb

+5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
proj.setting(:augeas_version, '1.14.1')
88
# TODO: Can runtime projects use these updated versions?
99
proj.setting(:rubygem_deep_merge_version, '1.2.2')
10+
# bolt-runtime must be made compatible with minitar 1.x before
11+
# bumping to a version of puppet 8 that requires minitar 1.x
1012
proj.setting(:rubygem_puppet_version, '7.32.1')
13+
# if you update puppet version to a version that requires minitar 1.x,
14+
# then update minitar too
15+
# proj.settings(:rubygem_minitar_version, '1.0.1')
1116

1217
platform = proj.get_platform
1318

configs/projects/pe-bolt-server-runtime-main.rb

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
project 'pe-bolt-server-runtime-main' do |proj|
22
proj.setting(:pe_version, 'main')
3+
# pe-bolt-server must be made compatible with minitar 1.x before
4+
# bumping to a version of puppet 8 that requires minitar 1.x
35
proj.setting(:rubygem_puppet_version, '8.8.1')
6+
# if you update puppet version to a version that requires minitar 1.x,
7+
# then update minitar too
8+
# proj.settings(:rubygem_minitar_version, '1.0.1')
9+
410
# We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
511
# for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
612
# Once we are no longer using ruby 2.5 we can update.

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

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
# rubygem-net-ssh included in shared-agent-components
1010
proj.setting(:rubygem_net_ssh_version, '7.2.3')
11+
# verify pe-installer-runtime components are compatible with minitar 1.x before
12+
# bumping to a version of puppet 8 that requires minitar 1.x
1113
proj.setting(:rubygem_puppet_version, '8.8.1')
14+
# if you update puppet version to a version that requires minitar 1.x,
15+
# then update minitar too
16+
# proj.settings(:rubygem_minitar_version, '1.0.1')
17+
1218
instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
1319
end

0 commit comments

Comments
 (0)