Conversation
Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
|
/azp run |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
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
3 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.
Summary
Backport the VPP build update from upstream PR #271 to the
202605release branch.Original PR: #271
Conflict resolution
The source branch advanced from
2606-0.3to2606-0.4, while202605established its Trixie package line at2606-0.2. The conflict is resolved by setting the release branch's existingVPP_VERSIONexpression to$(VPP_VERSION_BASE)-0.4, preserving its2606base and+b1sonic1package naming convention.Validation
git diff --check0.4make -s -n -C vppbld repo_clone VPP_VERSION_SONIC=2606-0.4+b1sonic1