Backport #29926 by @wolfogre The post step was always waiting, even if all steps were done. Then, once the task was done, the post step became success immediately. Before: <img width="915" alt="xnip_240320_120228" src="https://github.com/go-gitea/gitea/assets/9418365/00347430-f998-4c43-917a-bf6dd6d0e333"> After: <img width="905" alt="xnip_240320_120443" src="https://github.com/go-gitea/gitea/assets/9418365/a419b111-17c2-4029-a022-c761cc419091"> Co-authored-by: Jason Song <i@wolfogre.com>tags/v1.21.9
@@ -41,6 +41,12 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep { | |||
} | |||
logIndex += preStep.LogLength | |||
// lastHasRunStep is the last step that has run. | |||
// For example, | |||
// 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): lastHasRunStep is step1. | |||
// 2. preStep(Success) -> step1(Success) -> step2(Success) -> step3(Success) -> postStep(Success): lastHasRunStep is step3. | |||
// 3. preStep(Success) -> step1(Success) -> step2(Failure) -> step3 -> postStep(Waiting): lastHasRunStep is step2. | |||
// So its Stopped is the Started of postStep when there are no more steps to run. | |||
var lastHasRunStep *actions_model.ActionTaskStep | |||
for _, step := range task.Steps { | |||
if step.Status.HasRun() { | |||
@@ -56,11 +62,15 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep { | |||
Name: postStepName, | |||
Status: actions_model.StatusWaiting, | |||
} | |||
if task.Status.IsDone() { | |||
// If the lastHasRunStep is the last step, or it has failed, postStep has started. | |||
if lastHasRunStep.Status.IsFailure() || lastHasRunStep == task.Steps[len(task.Steps)-1] { | |||
postStep.LogIndex = logIndex | |||
postStep.LogLength = task.LogLength - postStep.LogIndex | |||
postStep.Status = task.Status | |||
postStep.Started = lastHasRunStep.Stopped | |||
postStep.Status = actions_model.StatusRunning | |||
} | |||
if task.Status.IsDone() { | |||
postStep.Status = task.Status | |||
postStep.Stopped = task.Stopped | |||
} | |||
ret := make([]*actions_model.ActionTaskStep, 0, len(task.Steps)+2) |
@@ -103,6 +103,40 @@ func TestFullSteps(t *testing.T) { | |||
{Name: postStepName, Status: actions_model.StatusSuccess, LogIndex: 100, LogLength: 0, Started: 10100, Stopped: 10100}, | |||
}, | |||
}, | |||
{ | |||
name: "all steps finished but task is running", | |||
task: &actions_model.ActionTask{ | |||
Steps: []*actions_model.ActionTaskStep{ | |||
{Status: actions_model.StatusSuccess, LogIndex: 10, LogLength: 80, Started: 10010, Stopped: 10090}, | |||
}, | |||
Status: actions_model.StatusRunning, | |||
Started: 10000, | |||
Stopped: 0, | |||
LogLength: 100, | |||
}, | |||
want: []*actions_model.ActionTaskStep{ | |||
{Name: preStepName, Status: actions_model.StatusSuccess, LogIndex: 0, LogLength: 10, Started: 10000, Stopped: 10010}, | |||
{Status: actions_model.StatusSuccess, LogIndex: 10, LogLength: 80, Started: 10010, Stopped: 10090}, | |||
{Name: postStepName, Status: actions_model.StatusRunning, LogIndex: 90, LogLength: 10, Started: 10090, Stopped: 0}, | |||
}, | |||
}, | |||
{ | |||
name: "skipped task", | |||
task: &actions_model.ActionTask{ | |||
Steps: []*actions_model.ActionTaskStep{ | |||
{Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0}, | |||
}, | |||
Status: actions_model.StatusSkipped, | |||
Started: 0, | |||
Stopped: 0, | |||
LogLength: 0, | |||
}, | |||
want: []*actions_model.ActionTaskStep{ | |||
{Name: preStepName, Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0}, | |||
{Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0}, | |||
{Name: postStepName, Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0}, | |||
}, | |||
}, | |||
} | |||
for _, tt := range tests { | |||
t.Run(tt.name, func(t *testing.T) { |