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

Use Go 1.19 fmt for Gitea 1.17, sync emoji data #21239

Merged
merged 3 commits into from
Sep 22, 2022

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Sep 22, 2022

Recently, the images used by Gitea's drone pipeline were upgraded to Go 1.19.x

It causes the lint fails because Go 1.19 uses new code format.

This PR partially backport #20758 (including the emoji-data sync), partially fix the format manually.

@wxiaoguang wxiaoguang added this to the 1.17.3 milestone Sep 22, 2022
@wxiaoguang wxiaoguang added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Sep 22, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 22, 2022
@@ -214,8 +214,7 @@ const hdr = `

Copy link
Member

Choose a reason for hiding this comment

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

The 2020 three lines above is now outdated

Copy link
Member

Choose a reason for hiding this comment

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

But we should probably fix this on main rather then on this branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, this is only a backport

@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 Sep 22, 2022
@wxiaoguang wxiaoguang changed the title Use Go 1.19 fmt for Gitea 1.17 Use Go 1.19 fmt for Gitea 1.17, sync emoji data Sep 22, 2022
@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented Sep 22, 2022

The emoji-data is also synchronized from main branch (by the backport part), I think it's fine to get it in 1.17.

If there are some worries, we can revert it later.

@wxiaoguang wxiaoguang merged commit 20c135c into go-gitea:release/v1.17 Sep 22, 2022
@wxiaoguang wxiaoguang deleted the backport-go-fmt branch September 22, 2022 13:58
@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. 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.

4 participants