Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ group :test do
gem "cookstyle", ">= 7.32"
gem "faraday_middleware"
gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main"
gem "test-kitchen", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main", glob: "test-kitchen.gemspec"
# TODO: Replace kitchen-omnibus-chef with kitchen-chef-enterprise once private repo access is available for public runners
# kitchen-omnibus-chef is deprecated and won't receive updates, but provides chef-zero provisioner functionality
# gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main"
gem "kitchen-omnibus-chef", "~> 1.1"
gem "simplecov", require: false
end

Expand Down
2 changes: 1 addition & 1 deletion cleanup_lint_roller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ def cleanup_lint_roller_lockfile
warn " Warning: Failed to clean up lint_roller Gemfile.lock: #{e.message}"
end

cleanup_lint_roller_lockfile
cleanup_lint_roller_lockfile
16 changes: 9 additions & 7 deletions post-bundle-install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
matches = File.basename(gempath).match(/.*-[A-Fa-f0-9]{12}/)
next unless matches

gem_name = File.basename(Dir["#{gempath}/*.gemspec"].first, ".gemspec")
# FIXME: should strip any valid ruby platform off of the gem_name if it matches
Dir["#{gempath}/*.gemspec"].each do |gemspec_path|
gem_name = File.basename(gemspec_path, ".gemspec")
# FIXME: should strip any valid ruby platform off of the gem_name if it matches

next unless gem_name
next unless gem_name

puts "re-installing #{gem_name}..."
puts "re-installing #{gem_name}..."

Dir.chdir(gempath) do
system("gem build #{gem_name}.gemspec") or raise "gem build failed"
system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed"
Dir.chdir(gempath) do
system("gem build #{gem_name}.gemspec") or raise "gem build failed"
system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed"
end
end
end
Loading