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

vendor github.com/containers/image/v5@v5.2.0 #5062

Merged
merged 2 commits into from Feb 5, 2020

Conversation

vrothberg
Copy link
Member

See release notes:
https://github.com/containers/image/releases/tag/v5.2.0

Fixes: #4877
Signed-off-by: Valentin Rothberg rothberg@redhat.com

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 3, 2020
@mheon
Copy link
Member

mheon commented Feb 3, 2020

LGTM pending green tests

@vrothberg
Copy link
Member Author

/test images

1 similar comment
@vrothberg
Copy link
Member Author

/test images

@vrothberg
Copy link
Member Author

gcc errors for preamble:
In file included from _build/src/github.com/containers/libpod/vendor/github.com/mtrmac/gpgme/data.go:6:0:
./go_gpgme.h:15:1: error: unknown type name 'gpgme_off_t'
 extern gpgme_off_t gogpgme_data_seek(gpgme_data_t dh, gpgme_off_t offset, int whence);
 ^
./go_gpgme.h:15:55: error: unknown type name 'gpgme_off_t'
 extern gpgme_off_t gogpgme_data_seek(gpgme_data_t dh, gpgme_off_t offset, int whence);
                                                       ^

@cevich any chance we can get add fresher centos?

@mheon
Copy link
Member

mheon commented Feb 3, 2020

The image used for ci/prow/images lives in Openshift CI, but I forget where the dockerfiles are stored - @baude do you remember?

@vrothberg
Copy link
Member Author

vrothberg commented Feb 3, 2020

Please do not merge until we have @mtrmac 's ACK on the gpg issue.

@mtrmac
Copy link
Collaborator

mtrmac commented Feb 3, 2020

gpgme_off_t was defined in 1.4.1 > 1.3.2, I’m afraid I missed this new reference when updating the mtrmac/gpgme fork.

Note to self, for now: GPGME_VERSION_NUMBER exists in current versions, but not in 1.3.2. How to detect whether to add a typedef?

@mtrmac
Copy link
Collaborator

mtrmac commented Feb 4, 2020

This should be fixed in github.com/mtrmac/gpgme@v0.1.2; hopefully Dependabot will propagate that throughout the stack (like containers/image#810 ), though a new c/image release explicitly dragging it in might make sense anyway.

(Sadly, with semantic versioning enforcing vX.Y.Z, we can’t make a v0.1.1.1, and the version will drift from proglottis/gpgme. The alternative, using something like v0.1.2-mtrmac.1, would not be picked up by other consumers by default.)

See release notes:
	https://github.com/containers/image/releases/tag/v5.2.0

Fixes: containers#4877
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Fixes a build regression on CentOS 7 and RHEL 7 with older gpgme
versions.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
@vrothberg
Copy link
Member Author

Ready to be merged. @TomSweeneyRedHat @rhatdan @mtrmac @mheon @baude PTAL

@mheon
Copy link
Member

mheon commented Feb 5, 2020

Restarted two flakes, LGTM once things go green

@TomSweeneyRedHat
Copy link
Member

LGTM assuming happy tests. Some tests still look unhappy though.

@vrothberg
Copy link
Member Author

The Cirrus tests are running but somehow GitHub and Cirrus are not playing along very well for a while so the web UI is not showing that the tests are (re) running.

Finger's crossed 🤞

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

LGTM.

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mtrmac, vrothberg

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

mheon commented Feb 5, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2020
@openshift-merge-robot openshift-merge-robot merged commit fc0673f into containers:master Feb 5, 2020
@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 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman play kube tires to fetch amd64 infra container on arm
6 participants