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/* projects, Buildah to v1.35.0 and then to v1.36.0-dev #5385

Merged

Conversation

TomSweeneyRedHat
Copy link
Member

The fourth step in the vendor dance for Podman v5.0.

Bump:

c/storage v1.53.0
c/image v5.30.0
c/common v0.58.0
c/Buildah v1.35.0

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

Copy link
Contributor

openshift-ci bot commented Mar 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomSweeneyRedHat

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

@openshift-ci openshift-ci bot added the approved label Mar 6, 2024
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.

Looks like some test is failing because it now has a different digest, I leave it to @giuseppe @mtrmac @nalind to comment on that

Copy link
Member

Choose a reason for hiding this comment

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

This should not be commited AFAIK, no idea why this is not in gitignore

Copy link
Contributor

Choose a reason for hiding this comment

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

They are not in .gitignore so that Buildah builds on non-x86 platforms where the tools to recreate them are not available. (That is a decision which could be revisited.)

WRT the details of the changes, compare #5280 (comment) ; I didn’t (yet?) compare the files in this PR.

Copy link
Member

Choose a reason for hiding this comment

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

But these files are new and not committed yet at all https://github.com/containers/buildah/tree/main/internal/mkcw/embed, only the source and the compressed binary are committed.

Copy link
Contributor

Choose a reason for hiding this comment

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

My mistake, you are completely correct.

AFAICS 3b795dd renamed the files but did not update .gitignore.

Copy link
Contributor

Choose a reason for hiding this comment

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

#5389 should prevent this for the future.

Copy link
Member

Choose a reason for hiding this comment

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

same here

Copy link
Member Author

Choose a reason for hiding this comment

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

I've removed this and the other internal/mkcw/embed/entrypoint file that was added.

@mtrmac
Copy link
Contributor

mtrmac commented Mar 6, 2024

Looks like some test is failing because it now has a different digest, I leave it to @giuseppe @mtrmac @nalind to comment on that

Huh, #5382 is succeeding in this respect, and I can’t see that c/common should change much. It might be productive to merge #5382 first, to decrease the amount of changes to analyze.

My guess is that the conformance test digest computation needs something vaguely like https://github.com/containers/storage/blob/2a79830a222670cd559a264b402cd6a151ab6bc5/pkg/chunked/compressor/compressor.go#L418-L429 to read all trailing zeroes, but I can’t see any reason why that should start only failing in this PR.

As the title says.  Bump:

c/common  v0.58.0
c/image   v5.30.0
c/storage v1.53.0

In preparation for Podman v5.0

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
Bump to Buildah v1.35.0 in preparation of Podman v5.0.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
As the title says.  Bumping back to the next dev
version.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
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

@mtrmac
Copy link
Contributor

mtrmac commented Mar 7, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Mar 7, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1589b0a into containers:main Mar 7, 2024
36 checks passed
@mtrmac mtrmac mentioned this pull request Mar 7, 2024
openshift-merge-bot bot pushed a commit that referenced this pull request Mar 7, 2024
... to match the changes in 3b795dd .

Compare the discussion in #5385 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Jun 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants