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

Revert #5627 #5629

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Conversation

nalind
Copy link
Member

@nalind nalind commented Jul 15, 2024

What type of PR is this?

/kind other

What this PR does / why we need it:

We just updated from a development version of github.com/containers/image/v5 to a version that was cut from its stable release branch. Podman's development branch already depends on features which are newer than the image library's stable branch, and vendoring our development branch was breaking compilation over there.

How to verify it

containers/podman#13808 should be... well, not happy, but closer to happy.

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 Jul 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind

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

@nalind nalind force-pushed the but-we-needed-that branch from 7170328 to 9b24ce9 Compare July 15, 2024 22:11
This reverts commit 5940e72.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind nalind force-pushed the but-we-needed-that branch from 9b24ce9 to b756a3d Compare July 15, 2024 22:12
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

1 similar comment
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@edsantiago
Copy link
Member

Buildah got vendored into podman today, so there probably isn't a big need for the treadmill to be stable. I was just trying to be proactive.

@nalind
Copy link
Member Author

nalind commented Jul 16, 2024

podman might not need it, but main in this repository downgraded one of its dependencies unintentionally, and that should matter.

@rhatdan
Copy link
Member

rhatdan commented Jul 16, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jul 16, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit ec5b8fe into containers:main Jul 16, 2024
35 of 36 checks passed
@nalind nalind deleted the but-we-needed-that branch July 16, 2024 19:27
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Oct 15, 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.

3 participants