summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2022-02-23 11:51:13 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2022-02-23 11:51:13 -0800
commit5e4e1fe02acafb3a59512d703495332baece3fc7 (patch)
tree15121389ad586b56c89d0752a6f2da16e7693b89
parente67094a0e336bd72968eb1071b0b765858cddb78 (diff)
downloadchef-5e4e1fe02acafb3a59512d703495332baece3fc7.tar.gz
Workaround binstub conflicts with diff-lcs gem
Just nuke the other binstubs and the install works fine. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--.github/workflows/kitchen.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 517cac39ea..e608f73ca2 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -89,6 +89,7 @@ jobs:
sudo /opt/chef/embedded/bin/bundle config set --local without 'omnibus_package'
sudo /opt/chef/embedded/bin/bundle config set --local path 'vendor/bundle'
sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3
+ sudo rm -f /opt/chef/embedded/bin/{htmldiff,ldiff}
sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
sudo /opt/chef/embedded/bin/berks vendor cookbooks
sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist