Skip to content

Commit d1c7efa

Browse files
committed
(bug) - Remove build:pdk rake task
This updates the build rake tasks to build modules with modulebuilder as oppose to pdk::module::build. This class was removed in pdk 3.3.0, and as such we should update to use the recommended tooling for the job puppet-modulebuilder. This change is backwards-incompatible as it includes the deletion of the build:pdk rake task.
1 parent 6e600d1 commit d1c7efa

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

lib/puppetlabs_spec_helper/rake_tasks.rb

+5-20
Original file line numberDiff line numberDiff line change
@@ -123,26 +123,11 @@
123123

124124
desc 'Build puppet module package'
125125
task :build do
126-
Rake::Task['build:pdk'].invoke
127-
end
128-
129-
namespace :build do
130-
desc 'Build Puppet module with PDK'
131-
task :pdk do
132-
require 'pdk/util'
133-
require 'pdk/module/build'
134-
135-
path = PDK::Module::Build.invoke(force: true, 'target-dir': File.join(Dir.pwd, 'pkg'))
136-
puts "Module built: #{path}"
137-
rescue LoadError
138-
_ = `pdk --version`
139-
unless $CHILD_STATUS.success?
140-
warn 'Unable to build module. Please install PDK or add the `pdk` gem to your Gemfile.'
141-
abort
142-
end
143-
144-
system('pdk build --force')
145-
end
126+
require 'puppet/modulebuilder'
127+
target_dir = File.join(Dir.pwd, 'pkg')
128+
builder = Puppet::Modulebuilder::Builder.new(Dir.pwd, target_dir, nil)
129+
path = builder.build
130+
puts "Module built: #{path}"
146131
end
147132

148133
desc 'Clean a built module package'

puppetlabs_spec_helper.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
3131
spec.add_runtime_dependency 'mocha', '>= 1.0', '< 3'
3232
spec.add_runtime_dependency 'pathspec', '>= 0.2', '< 3'
3333
spec.add_runtime_dependency 'puppet-lint', '~> 4.0'
34+
spec.add_runtime_dependency 'puppet-modulebuilder', '~> 1.0'
3435
spec.add_runtime_dependency 'puppet-syntax', '~> 4.1', '>= 4.1.1'
3536
spec.add_runtime_dependency 'rspec-github', '~> 2.0'
3637
spec.add_runtime_dependency 'rspec-puppet', '~> 5.0'

0 commit comments

Comments
 (0)