Skip to content

Support Actions concurrency syntax #32751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

Support Actions concurrency syntax #32751

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d6a95ce
support concurrency
Zettat123 Dec 7, 2024
f713c68
Merge branch 'main' of https://github.com/go-gitea/gitea into pr/Zett…
ChristopherHX Jul 8, 2025
76f58ef
fix: lint
ChristopherHX Jul 8, 2025
249e315
fix: assert correct status code
ChristopherHX Jul 8, 2025
b012126
fix: rerun all jobs did not respect concurrency
ChristopherHX Jul 9, 2025
91fccb7
Fix and Test rerun single jobs
ChristopherHX Jul 9, 2025
2e6032a
Remove CancelJobsByJobConcurrency in PickTask
ChristopherHX Jul 13, 2025
1a08b87
Merge branch 'main' of https://github.com/go-gitea/gitea into pr/Zett…
ChristopherHX Jul 13, 2025
9bba25e
remove code
ChristopherHX Jul 15, 2025
e6d25e2
Merge branch 'main' of https://github.com/go-gitea/gitea into pr/Zett…
ChristopherHX Jul 15, 2025
dc86086
call EmitJobsIfReady when cancelling a run
Zettat123 Jul 19, 2025
8721155
add TestCancelConcurrentRun
Zettat123 Jul 19, 2025
c5444e7
improve concurrency index
Zettat123 Jul 21, 2025
63eaf15
modify cancel-in-progress behavior
Zettat123 Jul 22, 2025
96d6938
fix bugs and tests
Zettat123 Jul 22, 2025
ea2bc92
Merge branch 'main' into support-actions-concurrency
Zettat123 Jul 22, 2025
a4b76b6
update InsertRun
Zettat123 Jul 22, 2025
ca18672
modify cancel-in-progress behavior
Zettat123 Jul 23, 2025
dc003e4
fix lint
Zettat123 Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions routers/web/repo/actions/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,14 @@ func Cancel(ctx *context_module.Context) {

actions_service.CreateCommitStatus(ctx, jobs...)

run, err := actions_model.GetRunByIndex(ctx, ctx.Repo.Repository.ID, runIndex)
if err != nil {
ctx.ServerError("GetRunByIndex", err)
}
if err := actions_service.EmitJobsIfReady(run.ID); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Queue EmitJobsIfReady from Actions Notifier Job and Workflow Completed?

(The event source used by workflow_run and workflow_job webhooks / action trigger)

I mean whatif the job is cancelled by abandoning or other reasons.

Less explicit code that has the same weakness towards all ways of cancellation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When a job completes (regardless of its status being successful, failed or cancelled), we need to check for other jobs that might have been blocked by it. I add the cancelled job to the queue so that the blocked jobs can be detected.

I mean whatif the job is cancelled by abandoning or other reasons.

Yes, this change cannot cover all cases where jobs are cancelled. So I am thinking that if we can do this check when a job reaches its final status (Success, Failed, Cancelled, and Skipped). Maybe we can move UpdateRunJob to services layer to allow it to call EmitJobsIfReady when a job's status is updated.

log.Error("Emit ready jobs of run %d: %v", run.ID, err)
}

for _, job := range updatedjobs {
_ = job.LoadAttributes(ctx)
notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
Expand Down