Skip to content

Conversation

zeripath
Copy link
Contributor

We need pushes to v1.16.9 to create tags to 1.16.9 and 1.16 but not 1 or latest.

We have previously adjusted the manifest to remove the latest tag, and have removed
auto_tags so that 1 does not get tagged but in doing so we also stopped 1.16 being
tagged. So here we just state the that we tag x.yy in addition to x.yyz*.

Signed-off-by: Andrew Thornton [email protected]

We need pushes to v1.16.9 to create tags to 1.16.9 and 1.16 but not 1 or latest.

We have previously adjusted the manifest to remove the latest tag, and have removed
auto_tags so that 1 does not get tagged but in doing so we also stopped 1.16 being
tagged. So here we just state the that we tag x.yy in addition to x.yyz*.

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jul 10, 2022
@zeripath zeripath added this to the 1.16.9 milestone Jul 10, 2022
@richmahn
Copy link
Contributor

richmahn commented Jul 10, 2022

Does a release of the release/v1.17 branch make a 1 tag though? If so, then it would somehow have to know if there are tags greater in semver number than itself, such as v1.17.0-rc > v1.16.9 (when releasing v1.16.9) then don't create tag 1. Or is the 1 tag done away with all together?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 10, 2022
@zeripath
Copy link
Contributor Author

zeripath commented Jul 10, 2022

Does a release of the release/v1.17 branch make a 1 tag though?

What do you mean release of release/v1.17 branch?

If you mean a tag from the v1.17 branch, yes it will. The .drone.yml file there has:

auto_tag: true

Which uses the drone-docker plugin to create the following tags: (see https://github.com/drone-plugins/drone-docker/blob/a842dfe5571a7f204e00d138458b67d6153de3b4/tags.go#L42-L72)

	return []string{
		fmt.Sprintf("%0*d", len(dotParts[0]), version.Major),
		fmt.Sprintf("%0*d.%0*d", len(dotParts[0]), version.Major, len(dotParts[1]), version.Minor),
		fmt.Sprintf("%0*d.%0*d.%0*d", len(dotParts[0]), version.Major, len(dotParts[1]), version.Minor, len(dotParts[2]), version.Patch),
	}, nil

If so, then it would somehow have to know if there are tags greater in semver number than itself, such as v1.17.0-rc > v1.16.9 (when releasing v1.16.9) then don't create tag 1. Or is the 1 tag done away with all together?

This PR is only on the release/v1.16 branch. It makes no change to the v1.17 branch.

Tags from the release/v1.16 will create tags on docker for 1.16 and 1.16.x and will not touch latest or 1

@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 Jul 11, 2022
@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 Jul 11, 2022
@lunny lunny merged commit 7c80a0b into go-gitea:release/v1.16 Jul 11, 2022
@zeripath zeripath deleted the no-docker-tag-latest branch July 11, 2022 20:47
tyroneyeh added a commit to tyroneyeh/gitea that referenced this pull request Jul 13, 2022
commit 713bc6c
Author: 6543 <[email protected]>
Date:   Tue Jul 12 20:26:27 2022 +0200

    Changelog for 1.16.9 (update) (go-gitea#20341)

    * Changelog for 1.16.9 (update)

    * update security section

commit 6b7e860
Author: Lunny Xiao <[email protected]>
Date:   Wed Jul 13 01:13:31 2022 +0800

    Hide notify mail setting ui if not enabled (go-gitea#20138) (go-gitea#20337)

    Backport go-gitea#20138

commit 0f89417
Author: Gusted <[email protected]>
Date:   Tue Jul 12 12:52:20 2022 +0000

    Add write check for creating Commit status (go-gitea#20332) (go-gitea#20334)

    - Backport go-gitea#20332
      - Add write code checks for creating new commit status
      - Regression from go-gitea#5314
      - Resolves go-gitea#20331

commit 7c80a0b
Author: zeripath <[email protected]>
Date:   Mon Jul 11 10:15:43 2022 +0100

    Ensure that drone tags 1.16.x and 1.16 on push to v1.16.x tag (go-gitea#20304)

    We need pushes to v1.16.9 to create tags to 1.16.9 and 1.16 but not 1 or latest.

    We have previously adjusted the manifest to remove the latest tag, and have removed
    auto_tags so that 1 does not get tagged but in doing so we also stopped 1.16 being
    tagged. So here we just state the that we tag x.yy in addition to x.yyz*.

    Signed-off-by: Andrew Thornton <[email protected]>

commit b42df31
Author: zeripath <[email protected]>
Date:   Wed Jul 6 02:47:16 2022 +0100

    Only show Followers that current user can access (go-gitea#20220) (go-gitea#20253)

    Backport go-gitea#20220

    Users who are following or being followed by a user should only be
    displayed if the viewing user can see them.

    Signed-off-by: Andrew Thornton <[email protected]>

commit 6162fb0
Author: Gusted <[email protected]>
Date:   Fri Jul 1 17:39:10 2022 +0200

    Check for permission when fetching user controlled issues (go-gitea#20133) (go-gitea#20196)

    * Check if project has the same repository id with issue when assign project to issue

    * Check if issue's repository id match project's repository id

    * Add more permission checking

    * Remove invalid argument

    * Fix errors

    * Add generic check

    * Remove duplicated check

    * Return error + add check for new issues

    * Apply suggestions from code review

    Co-authored-by: Gusted <[email protected]>
    Co-authored-by: KN4CK3R <[email protected]>
    Co-authored-by: 6543 <[email protected]>
lunny pushed a commit to lunny/gitea that referenced this pull request Dec 20, 2022
…ea#20304)

We need pushes to v1.16.9 to create tags to 1.16.9 and 1.16 but not 1 or latest.

We have previously adjusted the manifest to remove the latest tag, and have removed
auto_tags so that 1 does not get tagged but in doing so we also stopped 1.16 being
tagged. So here we just state the that we tag x.yy in addition to x.yyz*.

Signed-off-by: Andrew Thornton <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants