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

Fix OCI image.version annotation for releases to use full semver #33698

Merged
merged 1 commit into from
Feb 24, 2025

Conversation

arifer612
Copy link
Contributor

This commit fixes the docker build workflow such that semver-tagged releases use the full semver for the OCI org.opencontainers.image.version annotation, instead of using the major version only.

This is done by changing the order of the tags that the docker/metadata-action action is told to generate. Since the tags that the action is told to generate are all of the same priority, the first in the list will be used to set the annotation.

There is no need to fix the other two docker build workflows, i.e., (i) the nightly releases and (ii) the rc-tagged releases. This is because (i) the nightly releases do not get tagged with a semver, so the issue does not exist, and (ii) rc-tagged releases only get built with one tag, so the issue of needing to set an order of how tags are generated is irrelevant.

Resolves #33697.

This commit fixes the docker build workflow such that semver-tagged releases use
the full semver for the OCI image.version annotation, instead of using the major
version only.

Resolves go-gitea#33697.
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 24, 2025
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 24, 2025
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

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

<3 thanks!

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 24, 2025
@techknowlogick techknowlogick added the backport/v1.23 This PR should be backported to Gitea 1.23 label Feb 24, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 24, 2025
@techknowlogick techknowlogick merged commit adf7018 into go-gitea:main Feb 24, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Feb 24, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Feb 24, 2025
…gitea#33698)

This commit fixes the docker build workflow such that semver-tagged
releases use the full semver for the OCI
`org.opencontainers.image.version` annotation, instead of using the
major version only.

This is done by changing the order of the tags that the
`docker/metadata-action` action is told to generate. Since the tags that
the action is told to generate are all of the same priority, the first
in the list will be used to set the annotation.

There is no need to fix the other two docker build workflows, i.e., (i)
the nightly releases and (ii) the rc-tagged releases. This is because
(i) the nightly releases do not get tagged with a semver, so the issue
does not exist, and (ii) rc-tagged releases only get built with one tag,
so the issue of needing to set an order of how tags are generated is
irrelevant.

Resolves go-gitea#33697.
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Feb 24, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 24, 2025
* giteaofficial/main:
  Always show the "rerun" button for action jobs (go-gitea#33692)
  Fix OCI image.version annotation for releases to use full semver (go-gitea#33698)
@arifer612 arifer612 deleted the fix/issue-33697 branch February 24, 2025 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/internal size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use full semver for OCI annotation
4 participants