CHEF-35087 - Use appbundler in hab packaging and install latest Habitat in Windows test#341
Merged
Merged
Conversation
Simplecov Report
|
nikhil2611
force-pushed
the
nikhil/CHEF-34831-scan-fix
branch
from
90f04a2 to
2232f48
Compare
nikhil2611
changed the title
sanghinitin
approved these changes
May 27, 2026
nikhil2611
force-pushed
the
nikhil/CHEF-34831-scan-fix
branch
from
583403d to
45535b0
Compare
This was referenced Jun 1, 2026
nikhil2611
changed the title
nikhil2611
changed the title
nikhil2611
changed the title
nikhil2611
changed the title
…windows test pipeline Signed-off-by: nikhil2611 <ngupta@progress.com>
- Simplified binstub_patch.rb to match chef/chef (only GEM_PATH + APPBUNDLER_ALLOW_RVM) - Updated do_setup_environment to use push_runtime_env/set_runtime_env - Fixed do_prepare to use proper /usr/bin/env symlink pattern with do_end cleanup - Reordered do_install: fix_interpreter vendor/bin -> appbundler -> sed binstub_patch - Reference external binstub_patch.rb file instead of inline generation - Removed fix_interpreter on bin/* (not needed, matches chef pattern) Signed-off-by: nikhil2611 <ngupta@progress.com>
Reverts addressable version bump, cleanup_lint_roller chef-cli addition, and .github directory removal logic from this PR as they are handled separately in PR #342. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: nikhil2611 <ngupta@progress.com>
sed is already available in the Habitat Studio base environment, so an explicit dependency is not required. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: nikhil2611 <ngupta@progress.com>
nikhil2611
force-pushed
the
nikhil/CHEF-34831-scan-fix
branch
from
da90000 to
a14d1d4
Compare
- Restore .github directories removal from vendored gems in plan.ps1 - Restore addressable dependency to >= 2.9.0, < 3.0 in gemspec (these changes were already merged and should not be reverted) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: nikhil2611 <ngupta@progress.com>
sanjain-progress
approved these changes
Jun 3, 2026
…roller.rb cleanup_lint_roller.rb does not exist in this repo. The equivalent script is cleanup_gem_lockfiles.rb which removes stray Gemfile.lock files from vendored gems. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: nikhil2611 <ngupta@progress.com>
neha-p6
pushed a commit
to chef/ohai
that referenced
this pull request
Jun 3, 2026
Mirror chef/chef-cli#341 changes in Ohai (excluding dependency updates). - Simplify Habitat install script usage in Buildkite artifact test - Update habitat plans to use appbundler-generated binstubs and runtime wrapper - Remove vendored .github directories to reduce scanner false positives - Generalize lockfile cleanup and add binstub patch helper Signed-off-by: Sachin Jain <Sachin.jain@chef.io> Co-authored-by: Sachin Jain <Sachin.jain@chef.io>
ashiqueps
approved these changes
Jun 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This pull request focuses on improving the packaging and installation process for
chef-cli, particularly in Habitat environments, and updates some dependencies. The main changes include refining how binstubs are generated and patched for better compatibilityPackaging and binstub improvements:
plan.shto generate binstubs forchef-cliusingappbundler, added a patch (binstub_patch.rb) to allow running binstubs directly, and replaced the previous wrapper function with a new runtime environment wrapper script. This ensures the correct Ruby and gem environment is set up when runningchef-cliand improves compatibility. (habitat/plan.sh,binstub_patch.rb, [1] [2]binstub_patch.rbautomatically to all generated binstubs in the package. (habitat/plan.sh, habitat/plan.shL66-R114)Build/test process improvements:
.expeditor/buildkite/artifact.habitat.test.ps1, [1] [2] [3].expeditor/buildkite/artifact.habitat.test.ps1, .expeditor/buildkite/artifact.habitat.test.ps1L84-L86)Related Issue
Types of changes
Checklist:
Gemfile.lockhas changed, I have used--conservativeto do it and included the full output in the Description above.