diff --git a/services/mailer/mail_workflow_run.go b/services/mailer/mail_workflow_run.go
index 5dd858edb1..74b68e0e89 100644
--- a/services/mailer/mail_workflow_run.go
+++ b/services/mailer/mail_workflow_run.go
@@ -5,6 +5,8 @@ package mailer
import (
"bytes"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/convert"
"context"
"fmt"
"sort"
@@ -45,13 +47,13 @@ func sendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo_model.Rep
}
subject = fmt.Sprintf("%s: %s (%s)", subject, run.WorkflowID, base.ShortSha(run.CommitSHA))
- jobs, err := actions_model.GetRunJobsByRunID(ctx, run.ID)
+ jobs0, err := actions_model.GetRunJobsByRunID(ctx, run.ID)
if err != nil {
log.Error("GetRunJobsByRunID: %v", err)
} else {
- sort.SliceStable(jobs, func(i, j int) bool {
- si := jobs[i].Status
- sj := jobs[j].Status
+ sort.SliceStable(jobs0, func(i, j int) bool {
+ si := jobs0[i].Status
+ sj := jobs0[j].Status
if si.IsSuccess() {
si = 99
}
@@ -61,6 +63,15 @@ func sendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo_model.Rep
return si < sj
})
}
+ convertedJobs0 := make([]*api.ActionWorkflowJob, 0, len(jobs0))
+ for _, job := range jobs0 {
+ c, err := convert.ToActionWorkflowJob(ctx, repo, nil, job)
+ if err != nil {
+ log.Error("convert.ToActionWorkflowJob: %v", err)
+ continue
+ }
+ convertedJobs0 = append(convertedJobs0, c)
+ }
displayName := fromDisplayName(sender)
@@ -70,14 +81,24 @@ func sendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo_model.Rep
}
for lang, tos := range langMap {
locale := translation.NewLocale(lang)
+ var runStatusText string
+ switch run.Status {
+ case actions_model.StatusSuccess:
+ runStatusText = locale.TrString("actions.status.success")
+ case actions_model.StatusFailure:
+ runStatusText = locale.TrString("actions.status.failure")
+ case actions_model.StatusCancelled:
+ runStatusText = locale.TrString("actions.status.cancelled")
+ }
var mailBody bytes.Buffer
if err := bodyTemplates.ExecuteTemplate(&mailBody, tplWorkflowRun, map[string]any{
- "Subject": subject,
- "Repo": repo,
- "Run": run,
- "Jobs": jobs,
- "locale": locale,
- "Language": locale.Language(),
+ "Subject": subject,
+ "Repo": repo,
+ "Run": run,
+ "RunStatusText": runStatusText,
+ "Jobs": convertedJobs0,
+ "locale": locale,
+ "Language": locale.Language(),
}); err != nil {
log.Error("ExecuteTemplate [%s]: %v", tplWorkflowRun, err)
}
diff --git a/templates/mail/notify/workflow_run.tmpl b/templates/mail/notify/workflow_run.tmpl
index 9d1d72135f..0d9bde128b 100644
--- a/templates/mail/notify/workflow_run.tmpl
+++ b/templates/mail/notify/workflow_run.tmpl
@@ -10,12 +10,14 @@
- {{.Repo.FullName}} {{.Run.WorkflowID}}: {{if .Run.Status.IsSuccess}}{{.locale.Tr "actions.status.success"}}{{else if .Run.Status.IsFailure}}{{.locale.Tr "actions.status.failure"}}{{else if .Run.Status.IsCancelled}}{{.locale.Tr "actions.status.cancelled"}}{{else}}{{.locale.Tr "actions.status.skipped"}}{{end}}
+ {{.Repo.FullName}} {{.Run.WorkflowID}}: {{.RunStatusText}}