Skip to content

fix ci #9958

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

Closed
wants to merge 4 commits into from
Closed

fix ci #9958

wants to merge 4 commits into from

Conversation

lunny
Copy link
Member

@lunny lunny commented Jan 24, 2020

Test if this fixed ci

@bagasme
Copy link
Contributor

bagasme commented Jan 24, 2020

@lunny what ci error you want to fix?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 24, 2020
@techknowlogick
Copy link
Member

@bagasme please see errors in CI currently: https://drone.gitea.io/go-gitea/gitea/20122/3/6

@6543
Copy link
Member

6543 commented Jan 24, 2020

can you update branch ?

@6543
Copy link
Member

6543 commented Jan 24, 2020

ok looks like #9959 did it .. can we close this ?

@zeripath
Copy link
Contributor

There is still a hidden error with the mail templates during testing.

@@ -237,7 +237,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, tos []string, fromMent

var mailBody bytes.Buffer

if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplName), mailMeta); err != nil {
if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplName+"-body"), mailMeta); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

This should not be necessary. bodyTemplates already contains templates for bodies only. This would generate names like "issue/new-body", which should not exist (and the function would leave mailBody empty).

It might be a little confusing that the log is written like:

log.Error("ExecuteTemplate [%s]: %v", string(tplName)+"/body", err)

Which suggest there is such thing as "issue/new/body", but in reality the name of the template is "issue/new" (or "issue/default") for both subject and body. The log says +"/body" only so the user knows which part of the template is failing.

@lunny lunny closed this Jan 26, 2020
@lunny lunny deleted the lunny/fix_ci branch January 26, 2020 10:01
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants