Skip to content

go.mod: github.com/opencontainers/image-spec v1.1.0-rc3#8498

Merged
AkihiroSuda merged 1 commit intocontainerd:mainfrom
AkihiroSuda:image-spec-v1.1.0-rc.3
May 10, 2023
Merged

go.mod: github.com/opencontainers/image-spec v1.1.0-rc3#8498
AkihiroSuda merged 1 commit intocontainerd:mainfrom
AkihiroSuda:image-spec-v1.1.0-rc.3

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented May 9, 2023

opencontainers/image-spec@3a7f492...v1.1.0-rc3

I guess we can cherrypick this to stop vendoring a "random" commit

@AkihiroSuda AkihiroSuda force-pushed the image-spec-v1.1.0-rc.3 branch from 6b27a86 to f5e0218 Compare May 9, 2023 07:08
@AkihiroSuda AkihiroSuda added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels May 9, 2023
@AkihiroSuda AkihiroSuda force-pushed the image-spec-v1.1.0-rc.3 branch from f5e0218 to f33c397 Compare May 9, 2023 07:19
@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented May 9, 2023

I guess we can cherrypick this to stop vendoring a "random" commit

(orthogonal to this); heads-up that this version is not compatible with BuildKit v0.10 and v0.11; needs some minor changes; I tried to be ahead of that at the time, but they weren't merged until recently (and still need to be back ported) see

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented May 9, 2023

oh! looks like integration/ needs a minor tweak as well; feel free to take my commit from #7382

=== Errors
Error: .\import_test.go:392:3: unknown field OS in struct literal of type "github.com/opencontainers/image-spec/specs-go/v1".Image
Error: .\import_test.go:393:3: unknown field Architecture in struct literal of type "github.com/opencontainers/image-spec/specs-go/v1".Image

@AkihiroSuda AkihiroSuda force-pushed the image-spec-v1.1.0-rc.3 branch 2 times, most recently from 8a5cb15 to 0617ff6 Compare May 9, 2023 13:24
@AkihiroSuda
go.mod: github.com/opencontainers/image-spec v1.1.0-rc3
4347fc8 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@estesp
Copy link
Copy Markdown
Member

estesp commented May 9, 2023

Hmm, GitHub says merge conflict but doesn't list any files. But I guess it needs a rebase?

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented May 9, 2023

Weird indeed; could it be file-attributes? Does it show anything if you click "fix" / "edit" merge conflicts (don't think that option shows for me as I don't have write access)

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented May 9, 2023

Locally it shows it conflicts with integration/client/go.mod from #8500, usually Github would show that

@AkihiroSuda AkihiroSuda force-pushed the image-spec-v1.1.0-rc.3 branch from 0617ff6 to 4347fc8 Compare May 10, 2023 02:46
@AkihiroSuda AkihiroSuda merged commit 18eb990 into containerd:main May 10, 2023
@thaJeztah thaJeztah mentioned this pull request May 10, 2023
Closed
@thaJeztah thaJeztah mentioned this pull request May 30, 2023
Merged
@austinvazquez austinvazquez added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@AkihiroSuda @thaJeztah @estesp @dmcgowan @austinvazquez