CHEF-32186: Bump Chef Infra Client 18.8.46 -> 18.10.17#4182
Open
lbakerchef wants to merge 3 commits into
Open
Conversation
👷 Deploy Preview for chef-server processing.
|
|
Contributor
Author
|
build: from build logs: from chef-server install: |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
1. STOP. The following must be done before proceeding:
a. chef-server-omnibus-config rebuild branch must have merged to main.
(No omnibus-software-private PR is required for a chef-only update.)
Do not proceed until confirmed.
2. Remove this commit:
git reset --hard HEAD^
(This leaves commit A — ".gitmodules points to main" — as the tip.)
3. Advance the omnibus submodule SHA to the new omnibus-config main HEAD:
cd omnibus
git fetch origin
git checkout main
git pull origin main
cd ..
git add omnibus
git commit -sm "Advance omnibus submodule to post-merge omnibus-config main HEAD"
4. git push origin CHEF-32186/lbaker
Then open/merge the PR on github.com/chef/chef-server.
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
lbakerchef
force-pushed
the
CHEF-32186/lbaker
branch
from
f36c188 to
b045eff
Compare
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
1 participant
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.
Summary
Bumps Chef Infra Client from 18.8.46 to 18.10.17 (minor/patch bump within v18).
Changes
override :chef, version: "v18.8.46"(version now pinned via omnibus-config override)1-stable.18.8.46→18.10.1718.8.46→18.10.17; knife18.8.68→18.10.18; regenerated lock18.8.46→18.10.17; regenerated lock18.10.1718.8.46→18.10.1718.8.46→18.10.17CHEF-32186/lbakerNote on knife version
knife was bumped from
18.8.68→18.10.18to match chef's new major.minor (18.10). A major.minor mismatch causes an irresolvabletrain-winrmconstraint conflict in bundler.See the top commit on this branch for pre-merge instructions (submodule pointer handling).
Related PRs
Jira
CHEF-32186
Testing
All Gemfile.lock files regenerated via
bundle installin Docker (ruby:3.1.7 image).