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

Bump c/storage to v1.57.1, c/image to v5.34.0, then to v5.35.0-dev #2700

Merged
merged 3 commits into from
Jan 31, 2025

Conversation

TomSweeneyRedHat
Copy link
Member

Bumping c/image to v5.34.0 after vendoring c/storage v1.57.0

This is in preparation for Podman v5.4

@TomSweeneyRedHat
Copy link
Member Author

@mtrmac PTAL, especially the second commit. The version got set in the main branch to 5.34.1-dev prior. I think creating 5.34.0 at this point will be OK, but I'm a little concerned about projects that may have vendored from main in the past few weeks. Go vendoring sometimes gets wonky.

@Luap99
Copy link
Member

Luap99 commented Jan 30, 2025

The version from the file doe snot matter a bit to the go vendoring so it makes no difference. go vendoring works based of the tag names.

So bumping to 5.34.0 seems like the correct things to do, skipping a .0 would possibly confuse quite a few folks.

@mtrmac
Copy link
Collaborator

mtrmac commented Jan 30, 2025

@mtrmac PTAL, especially the second commit. The version got set in the main branch to 5.34.1-dev prior.

I’m sorry, that’s my mistake, I should have caught that while creating #2691.

I think creating 5.34.0 at this point will be OK

I agree.

As Paul says, this is invisible to Go tools. It might show up in some version information, e.g. User-Agent strings, that could be interpreted as a post-5.34.0 version. I’m worried very little about that: The important part is the -dev suffix, which tells us that we need to actually ask for the precise commit — and once we do, that’s precise by itself.

Per a Slack conversation, should I merge this immediately, or do you want some variant of containers/storage#2230 be tagged first?

@TomSweeneyRedHat
Copy link
Member Author

It was found that a PR was needed in c/storage. We are working on updating the 1.57 branch there, and will revendor here after that is done.

@mtrmac mtrmac marked this pull request as draft January 30, 2025 19:18
Bumping c/storage to v1.57.1 in preparation for Podman v5.4.

Signed-off-by: tomsweeneyredhat <[email protected]>
Bump to c/image v5.34.0 in preparation for Podman v5.4

Signed-off-by: tomsweeneyredhat <[email protected]>
Bump c/image back to a dev version, v5.35.0-dev

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat changed the title Bump c/storage to v1.57.0, c/image to v5.34.0, then to v5.35.0-dev Bump c/storage to v1.57.1, c/image to v5.34.0, then to v5.35.0-dev Jan 30, 2025
@TomSweeneyRedHat
Copy link
Member Author

I've updated this to c/storage 1.57.1 and this can now be merged after happy tests and review. ATM, Skopeo Test is failing on what looks to be a network error.

@TomSweeneyRedHat TomSweeneyRedHat marked this pull request as ready for review January 30, 2025 23:02
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

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.

Thank you!

@mtrmac mtrmac merged commit 46ec793 into containers:main Jan 31, 2025
10 checks passed
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.

3 participants