Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release 0.11 #1900

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Conversation

anmaxvl
Copy link
Contributor

@anmaxvl anmaxvl commented Sep 14, 2023

Backport the following commits into release/0.11:

#1887

#1887

@TBBle
Copy link
Contributor

TBBle commented Sep 18, 2023

Looks like you need to backport #1799 too to pass CI.

#1891 has a bunch of CI changes proposed to backport to 0.9 including #1799 (there's a list in the first commit message); more of those might turn out to be necessary here too, since the actual branch point for 0.11 was back in May (https://github.com/microsoft/hcsshim/releases/tag/v0.10.0-rc.8), and almost all of those changes landed in main after that point.

@anmaxvl
Copy link
Contributor Author

anmaxvl commented Sep 18, 2023

@helsaawy and @kiashok any preference here? I'm not completely sure about protobuf changes, since @kiashok mentioned some issues in upstream containerd because of it?

@helsaawy
Copy link
Contributor

@helsaawy and @kiashok any preference here? I'm not completely sure about protobuf changes, since @kiashok mentioned some issues in upstream containerd because of it?

I'd say we avoid the protobuf changes, but we probably should update the CI with the other changes
I can cut a PR once #1891 merges

@thaJeztah
Copy link
Contributor

Signed-off-by: Seth Hollandsworth <sethho@microsoft.com>
Co-authored-by: ksayid <khalilsayid@microsoft.com>
(cherry picked from commit e7509cc)
Signed-off-by: Maksim An <maksiman@microsoft.com>
Send the modify request even if stdin is nil, let the process handle it

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
(cherry picked from commit 27df1b9)
Signed-off-by: Maksim An <maksiman@microsoft.com>
Copy link
Contributor

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@anmaxvl anmaxvl merged commit 641f8b8 into microsoft:release/0.11 Sep 20, 2023
16 checks passed
@anmaxvl anmaxvl deleted the update-release-0.11 branch September 20, 2023 22:52
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants