Repository navigation
Align main UBI runtime with 3.7 release to unblock sync - #63
Open
Gkrumbach07 wants to merge 1 commit into
Open
Gkrumbach07 wants to merge 1 commit into
Gkrumbach07 wants to merge 1 commit into
Conversation
Signed-off-by: Gage Krumbach <gkrumbac@redhat.com>
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
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
mainwithrhoai-3.7-ea.1.deploy/Dockerfile.konfluxconflict in the Main to Release auto-merge job.Verification
git diff --checkgit merge-tree --write-tree origin/rhoai-3.7-ea.1 codex/align-main-ubi-runtime-3-7completed without conflicts.The failing job is run 41273528827, job 124751031257. The same conflict remained in run 42783516771. This also carries the image update proposed by MintMaker in #62, whose branch currently conflicts with
mainbecause its Go image line is stale.