diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index a0f03ec7e900..600ef94413ae 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -31,8 +31,15 @@ const ( ) type Workflow struct { - Entry git.TreeEntry - ErrMsg string + Entry git.TreeEntry + ErrMsg string + Name string + WorkflowID string +} + +type Run struct { + ActionRun actions_model.ActionRun + Workflow Workflow } // MustEnableActions check if actions are enabled in settings @@ -60,6 +67,7 @@ func List(ctx *context.Context) { ctx.Data["PageIsActions"] = true var workflows []Workflow + var runs []Run if empty, err := ctx.Repo.GitRepo.IsEmpty(); err != nil { ctx.ServerError("IsEmpty", err) return @@ -92,7 +100,7 @@ func List(ctx *context.Context) { workflows = make([]Workflow, 0, len(entries)) for _, entry := range entries { - workflow := Workflow{Entry: *entry} + workflow := Workflow{Entry: *entry, WorkflowID: entry.Name(), Name: entry.Name()} content, err := actions.GetContentFromEntry(entry) if err != nil { ctx.ServerError("GetContentFromEntry", err) @@ -104,6 +112,12 @@ func List(ctx *context.Context) { workflows = append(workflows, workflow) continue } + + // The workflow name is the name from the yaml file, otherwise remains the filename. + if wf.Name != "" { + workflow.Name = wf.Name + } + // The workflow must contain at least one job without "needs". Otherwise, a deadlock will occur and no jobs will be able to run. hasJobWithoutNeeds := false // Check whether have matching runner and a job without "needs" @@ -186,22 +200,32 @@ func List(ctx *context.Context) { opts.Status = []actions_model.Status{actions_model.Status(status)} } - runs, total, err := db.FindAndCount[actions_model.ActionRun](ctx, opts) + actionRuns, total, err := db.FindAndCount[actions_model.ActionRun](ctx, opts) if err != nil { ctx.ServerError("FindAndCount", err) return } - for _, run := range runs { - run.Repo = ctx.Repo.Repository - } - - if err := actions_model.RunList(runs).LoadTriggerUser(ctx); err != nil { + if err := actions_model.RunList(actionRuns).LoadTriggerUser(ctx); err != nil { ctx.ServerError("LoadTriggerUser", err) return } - ctx.Data["Runs"] = runs + runs = make([]Run, 0, len(actionRuns)) + for _, actionRun := range actionRuns { + actionRun.Repo = ctx.Repo.Repository + run := Run{ActionRun: *actionRun} + + // Connect the workflow to the run + for _, wf := range workflows { + if wf.WorkflowID == actionRun.WorkflowID { + run.Workflow = wf + } + } + runs = append(runs, run) + } + + ctx.Data["WorkflowActionRuns"] = runs actors, err := actions_model.GetActors(ctx, ctx.Repo.Repository.ID) if err != nil { diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index b66d0e360ab0..cb27173e3245 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -10,7 +10,7 @@
{{ctx.Locale.Tr "actions.runs.all_workflows"}} {{range .workflows}} - {{.Entry.Name}} + {{.Name}} {{if .ErrMsg}} {{svg "octicon-alert" 16 "text red"}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 09a25ce8bdc4..c6033e1970a1 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,40 +1,42 @@
- {{if not .Runs}} + {{if not .WorkflowActionRuns}}
{{svg "octicon-no-entry" 48}}

{{if $.IsFiltered}}{{ctx.Locale.Tr "actions.runs.no_results"}}{{else}}{{ctx.Locale.Tr "actions.runs.no_runs"}}{{end}}

{{end}} - {{range .Runs}} + {{range $run := .WorkflowActionRuns}} + {{$actionRun := $run.ActionRun}} + {{$workflow := $run.Workflow}}
- {{template "repo/actions/status" (dict "status" .Status.String)}} + {{template "repo/actions/status" (dict "status" $actionRun.Status.String)}}
- - {{if .Title}}{{.Title}}{{else}}{{ctx.Locale.Tr "actions.runs.empty_commit_message"}}{{end}} + + {{if $actionRun.Title}}{{$actionRun.Title}}{{else}}{{ctx.Locale.Tr "actions.runs.empty_commit_message"}}{{end}}
- {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}: - {{- if .ScheduleID -}} + {{if not $.CurWorkflow}}{{$workflow.Name}} {{end}}#{{$actionRun.Index}}: + {{- if $actionRun.ScheduleID -}} {{ctx.Locale.Tr "actions.runs.scheduled"}} {{- else -}} {{ctx.Locale.Tr "actions.runs.commit"}} - {{ShortSha .CommitSHA}} + {{ShortSha $actionRun.CommitSHA}} {{ctx.Locale.Tr "actions.runs.pushed_by"}} - {{.TriggerUser.GetDisplayName}} + {{$actionRun.TriggerUser.GetDisplayName}} {{- end -}}
- {{if .RefLink}} - {{.PrettyRef}} + {{if $actionRun.RefLink}} + {{$actionRun.PrettyRef}} {{else}} - {{.PrettyRef}} + {{$actionRun.PrettyRef}} {{end}}
-
{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}
-
{{svg "octicon-stopwatch" 16}}{{.Duration}}
+
{{svg "octicon-calendar" 16}}{{TimeSinceUnix $actionRun.Updated ctx.Locale}}
+
{{svg "octicon-stopwatch" 16}}{{$actionRun.Duration}}