From 5099d3c747ce09628ec1caf810292e4b8a510c54 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 1 Mar 2024 21:51:54 +0800 Subject: [PATCH] Set pre-step status to `skipped` if job is skipped (#29489) (#29523) Backport #29489 by @sillyguodong close #27496 1. Set pre-step (Set up job) status to `skipped` if job is skipped. 2. Apart from pre-step, the other steps should also be set to `skipped`. The status of other steps are reported from the runner side. This will be completed by this PR: https://gitea.com/gitea/act_runner/pulls/500 before: ![image](https://github.com/go-gitea/gitea/assets/33891828/4bac2ba9-66de-4679-b7ed-fbae459c0c54) after: ![image](https://github.com/go-gitea/gitea/assets/33891828/ead4871a-4e0f-4bb1-9fb4-37f4fdb78dfc) Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> (cherry picked from commit 8d085587831d1357ae80046fe0627dbcc8657a79) --- modules/actions/task_state.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go index cbbc0b357d..fe925bbb5d 100644 --- a/modules/actions/task_state.go +++ b/modules/actions/task_state.go @@ -35,6 +35,9 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep { } else if task.Status.IsDone() { preStep.Stopped = task.Stopped preStep.Status = actions_model.StatusFailure + if task.Status.IsSkipped() { + preStep.Status = actions_model.StatusSkipped + } } logIndex += preStep.LogLength