Skip to content

[Build]: fix build version conflict issue in 202111 branch#10717

Merged
lguohan merged 2 commits intosonic-net:202111from
xumia:cherry-pick-build-fix-202111
May 30, 2022
Merged

[Build]: fix build version conflict issue in 202111 branch#10717
lguohan merged 2 commits intosonic-net:202111from
xumia:cherry-pick-build-fix-202111

Conversation

@xumia
Copy link
Copy Markdown
Collaborator

@xumia xumia commented Apr 29, 2022

Why I did it

Some of the PRs are missed to cherry-pick to the 202111 branch.

[build] docker-sonic-mgmt replace USER by whoami (Azure#9702)
[Build]: Fix pip version constraint conflict issue (Azure#10525)

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@xumia xumia requested a review from lguohan as a code owner April 29, 2022 14:37
@xumia xumia added the Build label Apr 29, 2022
@xumia xumia requested a review from liushilongbuaa April 29, 2022 14:37
liushilongbuaa and others added 2 commits April 29, 2022 14:47
Why I did it
[Build]: Fix pip version constraint conflict issue
When a version is specified in the constraint file, if upgrading the version in build script, it will have conflict issue.

How I did it
If a specified version has specified in pip command line, then the version constraint will be skipped.
@xumia xumia force-pushed the cherry-pick-build-fix-202111 branch from 6b5bf04 to 029f2fe Compare April 29, 2022 14:48
@qiluo-msft
Copy link
Copy Markdown
Collaborator

To prevent squash merge lose the history, could you add the commits messages in PR description.
A better practice is to 'Rebase and merge' for this kind of cherry-pick.

@xumia
Copy link
Copy Markdown
Collaborator Author

xumia commented Apr 30, 2022

To prevent squash merge lose the history, could you add the commits messages in PR description. A better practice is to 'Rebase and merge' for this kind of cherry-pick.

Thanks, added the commit messages, I will use "rebase and merge" for the PR.

@xumia
Copy link
Copy Markdown
Collaborator Author

xumia commented May 1, 2022

@qiluo-msft , please help review again, thanks.

@lguohan lguohan merged commit 5bf840d into sonic-net:202111 May 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants