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

[v3.2] Update vendors of container projects #10415

Merged
merged 3 commits into from
May 20, 2021

Conversation

mheon
Copy link
Member

@mheon mheon commented May 20, 2021

Update our c/common, c/storage, and Buildah to match the main branch.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2021
@rhatdan
Copy link
Member

rhatdan commented May 20, 2021

/lgtm
/approve
/hold
If this passes tests, then merge.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mheon
Copy link
Member Author

mheon commented May 20, 2021

I'm not sure what's going on here. make vendor passes cleanly on my system...

Last PR before 3.2.0-RC2

Signed-off-by: Matthew Heon <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
@mheon
Copy link
Member Author

mheon commented May 20, 2021

And now Build each commit is failing. Naturally, it builds locally.

@mheon
Copy link
Member Author

mheon commented May 20, 2021

Ah, we never reset base branch in Cirrus

@mheon
Copy link
Member Author

mheon commented May 20, 2021

@cevich PTAL at the DEST_BRANCH change

@rhatdan
Copy link
Member

rhatdan commented May 20, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
Update containers common to the latest HEAD.  Some bug fixes in libimage
forced us to have a clearer separation between ordinary images and
manifest lists.  Hence, when looking up manifest lists without recursing
into any of their instances, we need to use `LookupManifestList()`.

Also account for some other changes in c/common (e.g., the changed order
in the security labels).

Further vendor the latest HEAD from Buildah which is required to get the
bud tests to pass.

Signed-off-by: Valentin Rothberg <[email protected]>

<MH: Stripped out vendor bits - just left remaining changes>

Signed-off-by: Matthew Heon <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
@cevich
Copy link
Member

cevich commented May 20, 2021

LGTM

@baude
Copy link
Member

baude commented May 20, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
@mheon
Copy link
Member Author

mheon commented May 20, 2021

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2021
@openshift-merge-robot openshift-merge-robot merged commit 5d1e39b into containers:v3.2 May 20, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants