mirror of
https://github.com/go-gitea/gitea.git
synced 2026-06-08 20:03:34 +02: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>
31 lines
1.5 KiB
Go HTML Template
31 lines
1.5 KiB
Go HTML Template
{{/* Status icons used for runs, jobs and steps.
|
|
|
|
Template Attributes:
|
|
* Status: one of success, skipped, waiting, blocked, running, failure, cancelled, cancelling, unknown
|
|
* Size: icon size in pixels (default 16)
|
|
* ClassName: additional CSS classes
|
|
* IconVariant: "circle-fill" → octicon-check-circle-fill / octicon-x-circle-fill
|
|
|
|
Keep this template in sync with web_src/js/components/ActionStatusIcon.vue.
|
|
*/}}
|
|
{{- $size := or .Size 16 -}}
|
|
{{- $className := or .ClassName "" -}}
|
|
{{- $circleFill := eq .IconVariant "circle-fill" -}}
|
|
{{if eq .Status "success"}}
|
|
{{svg (Iif $circleFill "octicon-check-circle-fill" "octicon-check") $size (printf "tw-text-green %s" $className)}}
|
|
{{else if eq .Status "skipped"}}
|
|
{{svg "octicon-skip" $size (printf "tw-text-text-light %s" $className)}}
|
|
{{else if eq .Status "cancelled"}}
|
|
{{svg "octicon-stop" $size (printf "tw-text-text-light %s" $className)}}
|
|
{{else if eq .Status "waiting"}}
|
|
{{svg "octicon-circle" $size (printf "tw-text-text-light %s" $className)}}
|
|
{{else if eq .Status "blocked"}}
|
|
{{svg "octicon-blocked" $size (printf "tw-text-yellow %s" $className)}}
|
|
{{else if eq .Status "running"}}
|
|
{{svg "gitea-running" $size (printf "tw-text-yellow rotate-clockwise %s" $className)}}
|
|
{{else if eq .Status "cancelling"}}
|
|
{{svg "octicon-stop" $size (printf "tw-text-yellow %s" $className)}}
|
|
{{else}}{{/*failure, unknown*/}}
|
|
{{svg (Iif $circleFill "octicon-x-circle-fill" "octicon-x") $size (printf "tw-text-red %s" $className)}}
|
|
{{end}}
|