mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-23 05:42:33 +09:00
e7af84df72
## Fixes #36983 ## Summary 1. Add transitional `Cancelling` status (between `Running` and `Cancelled`); cancel flow marks active tasks `Cancelling`, runner finalizes to `Cancelled` on terminal result. 2. Taskless jobs cancel directly (no runner to finalize). 3. Runner-protocol responses map `Cancelling` → `RESULT_CANCELLED`. 4. Run/job aggregation treats `Cancelling` as active. 5. Status mapping/aggregation tests + en-US locale added. **Problem** When a workflow was cancelled from the UI, jobs were marked cancelled immediately, which could skip post-run cleanup behavior. ## Solution Use a transitional status path: Running → Cancelling → Cancelled This allows runner finalization and cleanup path execution before final terminal state. **Testing** > 1. go test -tags "sqlite sqlite_unlock_notify" ./models/actions -run "TestAggregateJobStatus|TestStatusAsResult|TestStatusFromResult" > 2. go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.4 run ./models/actions/... ./routers/api/actions/runner/... ## Related - act_runner: https://gitea.com/gitea/act_runner/pulls/825 — independent; this PR's capability gate keeps legacy runners on the immediate-cancel path. The new flow activates only for runners that advertise the `cancelling` capability. Co-authored-by: Nicolas <bircni@icloud.com> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Claude (Opus 4.7) <noreply@anthropic.com> Co-authored-by: Zettat123 <zettat123@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io>
97 lines
4.1 KiB
Go
97 lines
4.1 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package actions
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestAggregateJobStatus(t *testing.T) {
|
|
testStatuses := func(expected Status, statuses []Status) {
|
|
t.Helper()
|
|
var jobs []*ActionRunJob
|
|
for _, v := range statuses {
|
|
jobs = append(jobs, &ActionRunJob{Status: v})
|
|
}
|
|
actual := AggregateJobStatus(jobs)
|
|
if !assert.Equal(t, expected, actual) {
|
|
var statusStrings []string
|
|
for _, s := range statuses {
|
|
statusStrings = append(statusStrings, s.String())
|
|
}
|
|
t.Errorf("AggregateJobStatus(%v) = %v, want %v", statusStrings, statusNames[actual], statusNames[expected])
|
|
}
|
|
}
|
|
|
|
cases := []struct {
|
|
statuses []Status
|
|
expected Status
|
|
}{
|
|
// unknown cases, maybe it shouldn't happen in real world
|
|
{[]Status{}, StatusUnknown},
|
|
{[]Status{StatusUnknown, StatusSuccess}, StatusUnknown},
|
|
{[]Status{StatusUnknown, StatusSkipped}, StatusUnknown},
|
|
{[]Status{StatusUnknown, StatusFailure}, StatusFailure},
|
|
{[]Status{StatusUnknown, StatusCancelled}, StatusCancelled},
|
|
{[]Status{StatusUnknown, StatusCancelling}, StatusCancelling},
|
|
{[]Status{StatusUnknown, StatusWaiting}, StatusWaiting},
|
|
{[]Status{StatusUnknown, StatusRunning}, StatusRunning},
|
|
{[]Status{StatusUnknown, StatusBlocked}, StatusBlocked},
|
|
|
|
// success with other status
|
|
{[]Status{StatusSuccess}, StatusSuccess},
|
|
{[]Status{StatusSuccess, StatusSkipped}, StatusSuccess}, // skipped doesn't affect success
|
|
{[]Status{StatusSuccess, StatusFailure}, StatusFailure},
|
|
{[]Status{StatusSuccess, StatusCancelled}, StatusCancelled},
|
|
{[]Status{StatusSuccess, StatusCancelling}, StatusCancelling},
|
|
{[]Status{StatusSuccess, StatusWaiting}, StatusWaiting},
|
|
{[]Status{StatusSuccess, StatusRunning}, StatusRunning},
|
|
{[]Status{StatusSuccess, StatusBlocked}, StatusBlocked},
|
|
|
|
// any cancelled, then cancelled
|
|
{[]Status{StatusCancelled}, StatusCancelled},
|
|
{[]Status{StatusCancelled, StatusSuccess}, StatusCancelled},
|
|
{[]Status{StatusCancelled, StatusSkipped}, StatusCancelled},
|
|
{[]Status{StatusCancelled, StatusFailure}, StatusCancelled},
|
|
{[]Status{StatusCancelled, StatusCancelling}, StatusCancelling},
|
|
{[]Status{StatusCancelled, StatusWaiting}, StatusWaiting},
|
|
{[]Status{StatusCancelled, StatusRunning}, StatusRunning},
|
|
{[]Status{StatusCancelled, StatusBlocked}, StatusBlocked},
|
|
|
|
{[]Status{StatusCancelling}, StatusCancelling},
|
|
{[]Status{StatusCancelling, StatusRunning}, StatusCancelling},
|
|
{[]Status{StatusCancelling, StatusWaiting}, StatusCancelling},
|
|
{[]Status{StatusCancelling, StatusFailure}, StatusCancelling},
|
|
{[]Status{StatusCancelling, StatusSkipped}, StatusCancelling},
|
|
|
|
// failure with other status, usually fail fast, but "running" wins to match GitHub's behavior
|
|
// another reason that we can't make "failure" wins over "running": it would cause a weird behavior that user cannot cancel a workflow or get current running workflows correctly by filter after a job fail.
|
|
{[]Status{StatusFailure}, StatusFailure},
|
|
{[]Status{StatusFailure, StatusSuccess}, StatusFailure},
|
|
{[]Status{StatusFailure, StatusSkipped}, StatusFailure},
|
|
{[]Status{StatusFailure, StatusCancelled}, StatusCancelled},
|
|
{[]Status{StatusFailure, StatusCancelling}, StatusCancelling},
|
|
{[]Status{StatusFailure, StatusWaiting}, StatusWaiting},
|
|
{[]Status{StatusFailure, StatusRunning}, StatusRunning},
|
|
{[]Status{StatusFailure, StatusBlocked}, StatusBlocked},
|
|
|
|
// skipped with other status
|
|
// "all skipped" is also considered as "mergeable" by "services/actions.toCommitStatus", the same as GitHub
|
|
{[]Status{StatusSkipped}, StatusSkipped},
|
|
{[]Status{StatusSkipped, StatusSuccess}, StatusSuccess},
|
|
{[]Status{StatusSkipped, StatusFailure}, StatusFailure},
|
|
{[]Status{StatusSkipped, StatusCancelled}, StatusCancelled},
|
|
{[]Status{StatusSkipped, StatusCancelling}, StatusCancelling},
|
|
{[]Status{StatusSkipped, StatusWaiting}, StatusWaiting},
|
|
{[]Status{StatusSkipped, StatusRunning}, StatusRunning},
|
|
{[]Status{StatusSkipped, StatusBlocked}, StatusBlocked},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
testStatuses(c.expected, c.statuses)
|
|
}
|
|
}
|