Skip to content

[release/1.6] go.mod: update image-spec to merge-commit of v1 into main#6766

Merged
AkihiroSuda merged 1 commit intocontainerd:release/1.6from
thaJeztah:1.6_fix_pseudo_version
Apr 2, 2022
Merged

[release/1.6] go.mod: update image-spec to merge-commit of v1 into main#6766
AkihiroSuda merged 1 commit intocontainerd:release/1.6from
thaJeztah:1.6_fix_pseudo_version

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

This is a follow-up to 7ede40c (#6739), where we pinned the version of this dependency to prevent go modules rolling it back.

This patch updates the version to use the merge-commit that merged the v1.0 release branch back to the main branch in github.com/opencontainers/image-spec, so that go modules considers it "more recent" and doesn't roll back.

Updating does not introduce changes in the vendored code, as changs of the merged commits were either already in the main branch, or only affected non-code files.

Thanks to Tõnis Tiigi for pointing to this commit! (#6739 (comment))

This is a follow-up to 7ede40c, where we pinned
the version of this dependency to prevent go modules rolling it back.

This patch updates the version to use the merge-commit that merged the v1.0
release branch back to the main branch in github.com/opencontainers/image-spec,
so that go modules considers it "more recent" and doesn't roll back.

Updating does not introduce changes in the vendored code, as changs of the merged
commits were either already in the main branch, or only affected non-code files.

- full diff: opencontainers/image-spec@693428a...c5a74bc
- raw diff: https://github.com/opencontainers/image-spec/compare/693428a734f5..c5a74bcca799

Thanks to Tõnis Tiigi for pointing to this commit!

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

@tonistiigi @AkihiroSuda @kzys PTAL

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda merged commit 4f30dda into containerd:release/1.6 Apr 2, 2022
@thaJeztah thaJeztah deleted the 1.6_fix_pseudo_version branch April 2, 2022 22:53
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