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 Skopeo to v1.17.0, c/common v0.61.0, c/image v5.33.0, c/storage v1.56.0 #2458

Merged
merged 3 commits into from
Nov 13, 2024

Conversation

TomSweeneyRedHat
Copy link
Member

As the title says. In preparation of Skopeo v1.17.0 to go
out with Podman v5.3, also bump:

containers/storage: v1.56.0
containers/image: v5.33.0
containers/common: v0.61.0

@Luap99
Copy link
Member

Luap99 commented Nov 12, 2024

Looks like we need newer CI images first as a newer golang is required.

#2456 bumps to f41 but it seems it requires changes for the new dnf5?! So maybe not straight forward but I haven't looked.

@Luap99
Copy link
Member

Luap99 commented Nov 12, 2024

Oh wait our images are fine and have the good enough go. ostree-rs-ext is a special container task using quay.io/coreos-assembler/fcos-buildroot:testing-devel and I know nothing about that and who maintains that
cc @mtrmac

@Luap99
Copy link
Member

Luap99 commented Nov 12, 2024

Git points me at 12b24fc
@TomSweeneyRedHat maybe try bumping the number there to force a rebuild to pick up a new golang.

@mtrmac
Copy link
Contributor

mtrmac commented Nov 12, 2024

#2460 looks promising; please follow (the manually-updated version of) #2453 , and assuming that succeeds, rebase on top.

@mtrmac
Copy link
Contributor

mtrmac commented Nov 12, 2024

@TomSweeneyRedHat the c/image bump in #2453 passed tests and was merged; please rebase, the test should now pass.

@TomSweeneyRedHat
Copy link
Member Author

@Luap99 @mtrmac Thanks! Sorry about the slow turnaround, I had my head buried in other stuff. Just rebased and repushed.

@mtrmac
Copy link
Contributor

mtrmac commented Nov 12, 2024

@TomSweeneyRedHat I can’t see the update on GitHub’s UI yet.

As the title says.  In preparation of Skopeo v1.17.0 to go
out with Podman v5.3, this gets the c/* projects to:

containers/storage:  v1.56.0
containers/image:    v5.33.0
containers/common:   v0.61.0

Signed-off-by: tomsweeneyredhat <[email protected]>
As the title says, bumping to v1.17.0 to go out
with Podman v5.3.

Signed-off-by: tomsweeneyredhat <[email protected]>
Bumping to the next dev version on the main branch.

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat
Copy link
Member Author

Well, that was more fun than anticipated. The straight rebase didn't work, though. I did learn a few new git tricks to add to my bag of tricks. I wiped out the old commits, rebased them, and did them again. I'm seeing the new commits now; the old ones are gone. They should be GTG.

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

For vendor commits I never try to fix conflicts, redoing them is much simpler and faster so I agree with your drop the commits and redo them approach :)

Copy link
Contributor

@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.

This looks good skimming the diff, I didn’t now check the commit structure.

I might not be around today to finish this, please review/merge and don’t wait for me.

@mtrmac
Copy link
Contributor

mtrmac commented Nov 13, 2024

(For vendoring rebases, my go-to approach is to edit go.mod, leaving both versions in to resolve any conflict, and then go mod tidy && go mod vendor; that cleans up the duplicates in go.mod and overwrite the other conflicting parts.)

@TomSweeneyRedHat TomSweeneyRedHat changed the title Bump Skopeo to v1.17.0, c/common v0.60.0, c/image v5.33.0, c/storage v1.56.0 Bump Skopeo to v1.17.0, c/common v0.61.0, c/image v5.33.0, c/storage v1.56.0 Nov 13, 2024
@Luap99 Luap99 merged commit 1814294 into containers:main Nov 13, 2024
23 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