Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-10-03 14:07:06 +02:00
Code Issues Activity

use ToActionsStatus

Browse Source
This commit is contained in:
Christopher Homberger 2025-03-17 20:08:12 +01:00
parent 988cafe780
commit 20f5d6ee95
2 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/convert/convert.go
View File

@ -232,7 +232,7 @@ func ToActionTask(ctx context.Context, t *actions_model.ActionTask) (*api.Action
} }
func ToActionWorkflowRun(repo *repo_model.Repository, run *actions_model.ActionRun) (*api.ActionWorkflowRun, error) { func ToActionWorkflowRun(repo *repo_model.Repository, run *actions_model.ActionRun) (*api.ActionWorkflowRun, error) {
status, conclusion := toActionStatus(run.Status) status, conclusion := ToActionsStatus(run.Status)
return &api.ActionWorkflowRun{ return &api.ActionWorkflowRun{
ID: run.ID, ID: run.ID,
URL: fmt.Sprintf("%s/actions/runs/%d", repo.APIURL(), run.ID), URL: fmt.Sprintf("%s/actions/runs/%d", repo.APIURL(), run.ID),
@ -250,7 +250,7 @@ func ToActionWorkflowRun(repo *repo_model.Repository, run *actions_model.ActionR
}, nil }, nil
} }
func toActionStatus(status actions_model.Status) (string, string) { func ToActionsStatus(status actions_model.Status) (string, string) {
var action string var action string
var conclusion string var conclusion string
switch status { switch status {
@ -294,7 +294,7 @@ func ToActionWorkflowJob(ctx context.Context, repo *repo_model.Repository, job *
} }
} }
status, conclusion := toActionStatus(job.Status) status, conclusion := ToActionsStatus(job.Status)
var runnerID int64 var runnerID int64
var runnerName string var runnerName string
var steps []*api.ActionWorkflowStep var steps []*api.ActionWorkflowStep
@ -307,7 +307,7 @@ func ToActionWorkflowJob(ctx context.Context, repo *repo_model.Repository, job *
runnerName = runner.Name runnerName = runner.Name
} }
for i, step := range task.Steps { for i, step := range task.Steps {
stepStatus, stepConclusion := toActionStatus(job.Status) stepStatus, stepConclusion := ToActionsStatus(job.Status)
steps = append(steps, &api.ActionWorkflowStep{ steps = append(steps, &api.ActionWorkflowStep{
Name: step.Name, Name: step.Name,
Number: int64(i), Number: int64(i),

30
services/webhook/notifier.go
View File

@ -954,7 +954,7 @@ func (*webhookNotifier) WorkflowJobStatusUpdate(ctx context.Context, repo *repo_
org = convert.ToOrganization(ctx, organization.OrgFromUser(repo.Owner)) org = convert.ToOrganization(ctx, organization.OrgFromUser(repo.Owner))
} }
status, _ := toActionStatus(job.Status) status, _ := convert.ToActionsStatus(job.Status)
convertedJob, err := convert.ToActionWorkflowJob(ctx, repo, job) convertedJob, err := convert.ToActionWorkflowJob(ctx, repo, job)
if err != nil { if err != nil {
@ -984,7 +984,7 @@ func (*webhookNotifier) WorkflowRunStatusUpdate(ctx context.Context, repo *repo_
org = convert.ToOrganization(ctx, organization.OrgFromUser(repo.Owner)) org = convert.ToOrganization(ctx, organization.OrgFromUser(repo.Owner))
} }
status, _ := toActionStatus(run.Status) status, _ := convert.ToActionsStatus(run.Status)
convertedRun, err := convert.ToActionWorkflowRun(repo, run) convertedRun, err := convert.ToActionWorkflowRun(repo, run)
if err != nil { if err != nil {
@ -1003,29 +1003,3 @@ func (*webhookNotifier) WorkflowRunStatusUpdate(ctx context.Context, repo *repo_
log.Error("PrepareWebhooks: %v", err) log.Error("PrepareWebhooks: %v", err)
} }
} }
func toActionStatus(status actions_model.Status) (string, string) {
var action string
var conclusion string
switch status {
// This is a naming conflict of the webhook between Gitea and GitHub Actions
case actions_model.StatusWaiting:
action = "queued"
case actions_model.StatusBlocked:
action = "waiting"
case actions_model.StatusRunning:
action = "in_progress"
}
if status.IsDone() {
action = "completed"
switch status {
case actions_model.StatusSuccess:
conclusion = "success"
case actions_model.StatusCancelled:
conclusion = "cancelled"
case actions_model.StatusFailure:
conclusion = "failure"
}
}
return action, conclusion
}