danielepintore/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-06-27 18:15:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(actions): fix 500 error when canceling a canceling task (#38223)

Browse Source
This commit is contained in:
Aidan Fahey
2026-06-26 12:58:24 -04:00
committed by GitHub
parent c2f130d352
commit 1b0992eb2e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/convert/action_test.go
View File

@@ -177,3 +177,13 @@ func TestToActionWorkflowJob_StepStatusIsIndependentOfJobStatus(t *testing.T) {
assert.Equal(t, "completed", apiJob.Steps[1].Status, "step 1 status")
assert.Equal(t, "failure", apiJob.Steps[1].Conclusion, "step 1 conclusion")
}
func TestToActionsStatus_Cancelling(t *testing.T) {
action, conclusion := ToActionsStatus(actions_model.StatusCancelling)
assert.Equal(t, "in_progress", action)
assert.Empty(t, conclusion)
}
func TestToWorkflowRunAction_Cancelling(t *testing.T) {
assert.Equal(t, "in_progress", ToWorkflowRunAction(actions_model.StatusCancelling))
}

4
services/convert/convert.go
View File

@@ -412,7 +412,7 @@ func ToWorkflowRunAction(status actions_model.Status) (action string) {
switch status {
case actions_model.StatusWaiting, actions_model.StatusBlocked:
action = "requested"
case actions_model.StatusRunning:
case actions_model.StatusRunning, actions_model.StatusCancelling:
action = "in_progress"
default:
if status.IsDone() {
@@ -430,7 +430,7 @@ func ToActionsStatus(status actions_model.Status) (action, conclusion string) {
action = "queued" // "waiting" is a naming conflict of the webhook between Gitea and GitHub Actions
case actions_model.StatusBlocked:
action = "waiting" // naming conflict (as above)
case actions_model.StatusRunning:
case actions_model.StatusRunning, actions_model.StatusCancelling:
action = "in_progress"
default:
action = "completed"