From 5e7264fffedc8f1b081dd7988a548db0f3345bbc Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Wed, 16 Jul 2025 17:16:16 -0400 Subject: [PATCH 1/3] Bump c/storage to v1.59.0, c/image to v5.36.0 Possible replacement for #2476. I'm not sure if I messed something up when trying to merge in #2478 there, so thought I'd create this PR to see if I messed something up there when doing the merge/vendor. Signed-off-by: tomsweeneyredhat --- internal/deepcopy.go | 2 +- pkg/manifests/manifests_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/deepcopy.go b/internal/deepcopy.go index d000bd947..690b68fbe 100644 --- a/internal/deepcopy.go +++ b/internal/deepcopy.go @@ -7,7 +7,7 @@ import ( v1 "github.com/opencontainers/image-spec/specs-go/v1" ) -// DeepCopyDescriptor copies a Descriptor, deeply copying its contents +// DeepCopyDescriptor copies a Descriptor, deeply copying its contents. func DeepCopyDescriptor(original *v1.Descriptor) *v1.Descriptor { tmp := *original if original.URLs != nil { diff --git a/pkg/manifests/manifests_test.go b/pkg/manifests/manifests_test.go index 2f2adae4e..a9f7d3301 100644 --- a/pkg/manifests/manifests_test.go +++ b/pkg/manifests/manifests_test.go @@ -105,10 +105,10 @@ func TestAddInstance(t *testing.T) { t.Fatalf("adding an instance without platform info failed in %s: %v", version, err) } o, err := list.findOCIv1(manifestDigest) - if o == nil || err != nil { + if err != nil { t.Fatalf("adding an instance failed in %s: %v", version, err) } - if o.Platform != nil { + if o != nil && o.Platform != nil { t.Fatalf("added a Platform field (%+v) where none was expected: %v", o.Platform, err) } } From f0666e12ace2af7c4c33a31e9ea34ca90a8f5149 Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Wed, 16 Jul 2025 20:30:54 -0400 Subject: [PATCH 2/3] Bump c/common to v0.64.0 Bump c/common to v0.64.0 in preparation for Podman v5.6 Signed-off-by: tomsweeneyredhat --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index f78557ae2..e426975e4 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.65.0-dev" +const Version = "0.64.0" From 9f4f047f3fc6187230f6cac176b07d72d9d6907c Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Wed, 16 Jul 2025 20:38:28 -0400 Subject: [PATCH 3/3] Bump to v0.65.0-dev Bump to the next dev version, 0.65.0-dev, in the main c/common branch. Signed-off-by: tomsweeneyredhat --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e426975e4..f78557ae2 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.64.0" +const Version = "0.65.0-dev"