Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MODULES-9998) Require pdk/util and remove pdk pin #203

Merged
merged 2 commits into from
Oct 11, 2019
Merged

(MODULES-9998) Require pdk/util and remove pdk pin #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94daf4
Remove pdk pin
florindragos Oct 11, 2019
d765152
require pdk/util
florindragos Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/puppet_litmus/rake_tasks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def run_local_command(command)
# @return [Array] an array of module tar's
def build_modules_in_folder(source_folder)
require 'pdk/module/build'
require 'pdk/util'
folder_list = Dir.entries(source_folder).reject { |f| File.directory? f }
module_tars = []
folder_list.each do |folder|
Expand Down Expand Up @@ -278,6 +279,7 @@ def build_modules_in_folder(source_folder)
# stdout, stderr, _status = Open3.capture3(pdk_build_command)
# raise "Failed to run 'pdk_build_command',#{stdout} and #{stderr}" if (stderr =~ %r{completed successfully}).nil?
require 'pdk/module/build'
require 'pdk/util'

opts = {}
opts[:force] = true
Expand Down
2 changes: 1 addition & 1 deletion puppet_litmus.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
EOF
spec.summary = 'Providing a simple command line tool for puppet content creators, to enable simple and complex test deployments.'
spec.add_runtime_dependency 'bolt', ['>= 1.13.1', '< 2.0.0']
spec.add_runtime_dependency 'pdk', ['>= 1.10.0', '< 1.13.0']
spec.add_runtime_dependency 'pdk', ['>= 1.10.0', '< 2.0.0']
spec.add_runtime_dependency 'tty-spinner', ['>= 0.5.0', '< 1.0.0']
spec.add_runtime_dependency 'docker-api', ['>= 1.34', '< 2.0.0']
end