fix

Author: yp05327

models/actions/run.go

@@ -46,10 +46,13 @@ type ActionRun struct {
 	TriggerEvent      string                       // the trigger event defined in the `on` configuration of the triggered workflow
 	Status            Status                       `xorm:"index"`
 	Version           int                          `xorm:"version default 0"` // Status could be updated concomitantly, so an optimistic lock is needed
-	Started           timeutil.TimeStamp
-	Stopped           timeutil.TimeStamp
-	Created           timeutil.TimeStamp `xorm:"created"`
-	Updated           timeutil.TimeStamp `xorm:"updated"`
+	// Started and Stopped is used for recording last run time, if rerun happened, they will be reset to 0
+	Started timeutil.TimeStamp
+	Stopped timeutil.TimeStamp
+	// TotalDuration is used for recording the total duration of the workflow
+	TotalDuration time.Duration
+	Created       timeutil.TimeStamp `xorm:"created"`
+	Updated       timeutil.TimeStamp `xorm:"updated"`
 }
 
 func init() {
@@ -121,6 +124,18 @@ func (run *ActionRun) Duration() time.Duration {
 	return calculateDuration(run.Started, run.Stopped, run.Status)
 }
 
+func (run *ActionRun) DisplayDuration() time.Duration {
+	duration := calculateDuration(run.Started, run.Stopped, run.Status)
+	if run.Status.IsDone() {
+		// there was a bug when record stopped time, see https://github.com/go-gitea/gitea/issues/28323#issuecomment-1841867298
+		// and duration will be negitive because of the incorrect stopped time in db
+		// there's no way to fix them now, so in order to avoid displaying incorrect duration time,
+		// we will display 0 instead of negitive time
+		return slices.Max([]time.Duration{run.TotalDuration, duration})
+	}
+	return duration
+}
+
 func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) {
 	if run.Event == webhook_module.HookEventPush {
 		var payload api.PushPayload

models/actions/run_job.go

@@ -143,8 +143,9 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col
 		}
 		if run.Stopped.IsZero() && run.Status.IsDone() {
 			run.Stopped = timeutil.TimeStampNow()
+			run.TotalDuration += run.Duration()
 		}
-		if err := UpdateRun(ctx, run, "status", "started", "stopped"); err != nil {
+		if err := UpdateRun(ctx, run, "status", "started", "stopped", "total_duration"); err != nil {
 			return 0, fmt.Errorf("update run %d: %w", run.ID, err)
 		}
 	}

options/locale/locale_en-US.ini

@@ -3534,6 +3534,7 @@ runs.no_workflows.quick_start = Don't know how to start with Gitea Action? See <
 runs.no_workflows.documentation = For more information on the Gitea Action, see <a target="_blank" rel="noopener noreferrer" href="%s">the documentation</a>.
 runs.no_runs = The workflow has no runs yet.
 runs.empty_commit_message = (empty commit message)
+runs.last_run_time = Last run: %s
 
 workflow.disable = Disable Workflow
 workflow.disable_success = Workflow '%s' disabled successfully.

routers/web/repo/actions/view.go

@@ -279,6 +279,14 @@ func Rerun(ctx *context_module.Context) {
 		return
 	}
 
+	// reset run's start and stop time
+	run.Started = 0
+	run.Stopped = 0
+	if err := actions_model.UpdateRun(ctx, run, "started", "stopped"); err != nil {
+		ctx.Error(http.StatusInternalServerError, err.Error())
+		return
+	}
+
 	job, jobs := getRunJobs(ctx, runIndex, jobIndex)
 	if ctx.Written() {
 		return

templates/repo/actions/runs_list.tmpl

@@ -35,7 +35,7 @@
 			</div>
 			<div class="run-list-item-right">
 				<div class="run-list-meta">{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}</div>
-				<div class="run-list-meta">{{svg "octicon-stopwatch" 16}}{{.Duration}}</div>
+				<div class="run-list-meta" data-tooltip-placement="top" data-tooltip-content="{{ctx.Locale.Tr "actions.runs.last_run_time" .Duration}}">{{svg "octicon-stopwatch" 16}}{{.DisplayDuration}}</div>
 			</div>
 		</div>
 	{{end}}