From bf3559f0b59546ccc378d80f3621ba2a4f33b292 Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Mon, 7 Jul 2025 16:22:57 +0800
Subject: [PATCH] MAILER
---
services/mailer/mail_workflow_run.go | 31 ++++++++++++++++---------
templates/mail/notify/workflow_run.tmpl | 8 +------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/services/mailer/mail_workflow_run.go b/services/mailer/mail_workflow_run.go
index 74b68e0e89..1cfda240a3 100644
--- a/services/mailer/mail_workflow_run.go
+++ b/services/mailer/mail_workflow_run.go
@@ -5,12 +5,12 @@ package mailer
import (
"bytes"
- api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/services/convert"
"context"
"fmt"
"sort"
+ "code.gitea.io/gitea/services/convert"
+
"code.gitea.io/gitea/modules/translation"
actions_model "code.gitea.io/gitea/models/actions"
@@ -25,6 +25,13 @@ import (
const tplWorkflowRun = "notify/workflow_run"
+type convertedWorkflowJob struct {
+ HTMLURL string
+ Status actions_model.Status
+ Name string
+ Attempt int64
+}
+
func generateMessageIDForActionsWorkflowRunStatusEmail(repo *repo_model.Repository, run *actions_model.ActionRun) string {
return fmt.Sprintf("<%s/actions/runs/%d@%s>", repo.FullName(), run.Index, setting.Domain)
}
@@ -34,16 +41,13 @@ func sendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo_model.Rep
headers := generateMetadataHeaders(repo)
subject := "Run"
- if run.IsForkPullRequest {
- subject = "PR run"
- }
switch run.Status {
case actions_model.StatusFailure:
- subject = subject + " failed"
+ subject += " failed"
case actions_model.StatusCancelled:
- subject = subject + " cancelled"
+ subject += " cancelled"
case actions_model.StatusSuccess:
- subject = subject + " is successful"
+ subject += " is successful"
}
subject = fmt.Sprintf("%s: %s (%s)", subject, run.WorkflowID, base.ShortSha(run.CommitSHA))
@@ -63,14 +67,19 @@ func sendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo_model.Rep
return si < sj
})
}
- convertedJobs0 := make([]*api.ActionWorkflowJob, 0, len(jobs0))
+ convertedJobs := make([]convertedWorkflowJob, 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)
+ convertedJobs = append(convertedJobs, convertedWorkflowJob{
+ HTMLURL: c.HTMLURL,
+ Name: c.Name,
+ Status: job.Status,
+ Attempt: c.RunAttempt,
+ })
}
displayName := fromDisplayName(sender)
@@ -96,7 +105,7 @@ func sendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo_model.Rep
"Repo": repo,
"Run": run,
"RunStatusText": runStatusText,
- "Jobs": convertedJobs0,
+ "Jobs": convertedJobs,
"locale": locale,
"Language": locale.Language(),
}); err != nil {
diff --git a/templates/mail/notify/workflow_run.tmpl b/templates/mail/notify/workflow_run.tmpl
index 0d9bde128b..a1c1c24546 100644
--- a/templates/mail/notify/workflow_run.tmpl
+++ b/templates/mail/notify/workflow_run.tmpl
@@ -4,9 +4,6 @@
{{.Subject}}
-
@@ -16,17 +13,14 @@
{{range $job := .Jobs}}
- {{$job.Status}}: {{$job.Name}}{{if gt $job.RunAttempt 1}}, Attempt #{{$job.RunAttempt}}{{end}}
+ {{$job.Status}}: {{$job.Name}}{{if gt $job.Attempt 1}}, Attempt #{{$job.Attempt}}{{end}}
{{end}}
-