Support Actions `concurrency` syntax #32751

Zettat123 · 2024-12-07T12:37:19Z

Depends on https://gitea.com/gitea/act/pulls/124

https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#concurrency

⚠️ BREAKING ⚠️

This PR removes the auto-cancellation feature added by #25716. Users need to manually add concurrency to workflows to control concurrent workflows or jobs.

) Move the main logic of `generateTaskContext` and `findTaskNeeds` to the `services` layer. This is a part of #32751, since we need the git context and `needs` to parse the concurrency expressions. --------- Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: wxiaoguang <[email protected]>

…gitea#33280) Move the main logic of `generateTaskContext` and `findTaskNeeds` to the `services` layer. This is a part of go-gitea#32751, since we need the git context and `needs` to parse the concurrency expressions. --------- Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: wxiaoguang <[email protected]> (cherry picked from commit d0962ce) Conflicts: routers/api/actions/runner/main_test.go routers/api/actions/runner/utils.go services/actions/context_test.go services/actions/init_test.go tests/integration/actions_job_test.go simple conflicts related to ref_type": string(refName.RefType()), // string, The type of ref that triggered the workflow run. Valid values are branch or tag. Use env GITEA_RUNNER_REGISTRATION_TOKEN as global runner token (go-gitea#32946)

Zettat123 · 2025-02-08T02:30:22Z

This PR is ready for review. Please also review https://gitea.com/gitea/act/pulls/124 .

To support `concurrency` syntax for Gitea Actions Gitea PR: go-gitea/gitea#32751 Reviewed-on: https://gitea.com/gitea/act/pulls/124 Reviewed-by: Lunny Xiao <[email protected]> Co-authored-by: Zettat123 <[email protected]> Co-committed-by: Zettat123 <[email protected]>

lunny · 2025-02-17T20:48:05Z

Please resolve the conflicts and since https://gitea.com/gitea/act/pulls/124 merged, this PR can be updated.

Zettat123 · 2025-02-18T02:51:17Z

Please resolve the conflicts and since https://gitea.com/gitea/act/pulls/124 merged, this PR can be updated.

The conflicts were caused by model migrations instead of gitea/act. Now I've updated this PR and conflicts are resolved.

ChristopherHX · 2025-02-28T20:53:58Z

models/actions/run_job.go

+	return ShouldBlockRunByConcurrency(ctx, job.Run)
+}
+
+func CancelPreviousJobsByConcurrency(ctx context.Context, job *ActionRunJob) error {


I became today aware of a bug in the CancelPreviousJobs, jobs cancelled by this method don't get it's commit status updated from pending to cancelled this PR rewrites it.

Furthermore the actions_model cannot send webhooks / commit status, my conclusion is we have to change the return type to be like

([]*ActionRunJob, error) and always return the list for all jobs successfully cancelled. Then the actions_service can expose the function to its callers while handling commit status (and in future webhook) by traversing the ActionRunJob array

This bug did hit me in my workflow_job event hook code aka #33694 (comment) and this function reproduces it

The reason I got this bug was that I looked where commitstatus is maintained and this one never triggered a webhook, but it seems to skip commit status as well.

I will write an bug report soon and a proposed fix, but since this PR also changes affected code I want to sync here first.

My idea how to fix this method is shown in #33764 and should be integrated here or fixed differently.

ChristopherHX · 2025-02-28T21:02:41Z

models/actions/task.go

+	if err := CancelPreviousJobsByConcurrency(ctx, job); err != nil {
+		return nil, false, err
+	}
+


...per previous comment, this need to forward cancelled jobs as list to actions_service for both error and non error return value (we need to maintain the successfully cancelled status checks even if some failed)

actually this PR simplifies the bug surface a lot, only pickTask in actions services is a caller.
The old auto conconcurrency had a much larger defect area

lunny · 2025-03-02T07:00:06Z

services/actions/job_emitter_test.go

-			r := newJobStatusResolver(tt.jobs)
-			assert.Equal(t, tt.want, r.Resolve())
+			r := newJobStatusResolver(tt.jobs, nil)
+			assert.Equal(t, tt.want, r.Resolve(context.Background()))


Suggested change

assert.Equal(t, tt.want, r.Resolve(context.Background()))

assert.Equal(t, tt.want, r.Resolve(t.Context()))

lunny · 2025-03-02T07:01:31Z

services/actions/concurrency.go

+	}
+
+	gitCtx := GenerateGiteaContext(run, nil)
+	jobResults := map[string]*jobparser.JobResult{"": {}}


Why the empty element is necessary?

lunny · 2025-03-02T07:03:01Z

models/actions/run_list.go

@@ -99,6 +100,9 @@ func (opts FindRunOptions) ToConds() builder.Cond {
 	if opts.TriggerEvent != "" {
 		cond = cond.And(builder.Eq{"trigger_event": opts.TriggerEvent})
 	}
+	if len(opts.ConcurrencyGroup) > 0 {
+		cond = cond.And(builder.Eq{"concurrency_group": opts.ConcurrencyGroup})


Is concurrency_group an index column?

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 7, 2024

pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 7, 2024

github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/migrations modifies/dependencies labels Dec 7, 2024

Zettat123 force-pushed the support-actions-concurrency branch from 3551677 to fcf4517 Compare December 10, 2024 08:56

github-actions bot removed the modifies/dependencies label Dec 10, 2024

pull-request-size bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 12, 2024

lunny added this to the 1.24.0 milestone Dec 16, 2024

pull-request-size bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 16, 2024

Zettat123 force-pushed the support-actions-concurrency branch from 52833e7 to 130f2a2 Compare December 17, 2024 01:49

Zettat123 force-pushed the support-actions-concurrency branch 3 times, most recently from 461c7c1 to d5168a2 Compare January 6, 2025 06:16

Zettat123 force-pushed the support-actions-concurrency branch from e038ed2 to f77f266 Compare January 10, 2025 06:00

This was referenced Jan 14, 2025

[Actions] Opt-out from auto-cancellation #32662

Open

[Actions] Support concurrency syntax #24769

Open

Zettat123 changed the title ~~WIP: Support concurrency for Actions~~ WIP: Support Actions concurrency syntax Jan 15, 2025

Zettat123 mentioned this pull request Jan 15, 2025

workflow_dispatch allows only one job in a branch #33260

Open

Zettat123 force-pushed the support-actions-concurrency branch from ad71599 to 8f5948b Compare January 15, 2025 03:03

Zettat123 mentioned this pull request Jan 15, 2025

Move some Actions related functions from routers to services #33280

Merged

This comment was marked as resolved.

Sign in to view

Zettat123 force-pushed the support-actions-concurrency branch 2 times, most recently from 87a79d9 to eb43091 Compare January 16, 2025 02:09

github-actions bot removed the modifies/api This PR adds API routes or modifies them label Jan 16, 2025

Zettat123 force-pushed the support-actions-concurrency branch 2 times, most recently from 19d3dcb to 93af0ee Compare January 24, 2025 09:41

Zettat123 force-pushed the support-actions-concurrency branch 2 times, most recently from a1d070c to c433843 Compare February 8, 2025 02:09

Zettat123 marked this pull request as ready for review February 8, 2025 02:29

Zettat123 changed the title ~~WIP: Support Actions concurrency syntax~~ Support Actions concurrency syntax Feb 8, 2025

lunny added the pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! label Feb 8, 2025

Zettat123 force-pushed the support-actions-concurrency branch from c433843 to 7b27a42 Compare February 11, 2025 03:27

github-actions bot added the modifies/dependencies label Feb 11, 2025

Zettat123 force-pushed the support-actions-concurrency branch from 3263d4e to 85baf37 Compare February 11, 2025 07:03

support concurrency

9e21174

Zettat123 force-pushed the support-actions-concurrency branch from 85baf37 to 9e21174 Compare February 18, 2025 02:50

ChristopherHX reviewed Feb 28, 2025

View reviewed changes

ChristopherHX mentioned this pull request Mar 1, 2025

Fix auto concurrency cancellation skips commit status updates #33764

Open

lunny reviewed Mar 2, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Actions `concurrency` syntax #32751

Support Actions `concurrency` syntax #32751

Zettat123 commented Dec 7, 2024 •

edited

Loading

This comment was marked as resolved.

Zettat123 commented Feb 8, 2025

lunny commented Feb 17, 2025

Zettat123 commented Feb 18, 2025

ChristopherHX Feb 28, 2025 •

edited

Loading

ChristopherHX Feb 28, 2025 •

edited

Loading

lunny Mar 2, 2025

lunny Mar 2, 2025

lunny Mar 2, 2025

	assert.Equal(t, tt.want, r.Resolve(context.Background()))
	assert.Equal(t, tt.want, r.Resolve(t.Context()))

Support Actions concurrency syntax #32751

Are you sure you want to change the base?

Support Actions concurrency syntax #32751

Conversation

Zettat123 commented Dec 7, 2024 • edited Loading

⚠️ BREAKING ⚠️

This comment was marked as resolved.

Zettat123 commented Feb 8, 2025

lunny commented Feb 17, 2025

Zettat123 commented Feb 18, 2025

ChristopherHX Feb 28, 2025 • edited Loading

Choose a reason for hiding this comment

ChristopherHX Feb 28, 2025 • edited Loading

Choose a reason for hiding this comment

lunny Mar 2, 2025

Choose a reason for hiding this comment

lunny Mar 2, 2025

Choose a reason for hiding this comment

lunny Mar 2, 2025

Choose a reason for hiding this comment

Support Actions `concurrency` syntax #32751

Support Actions `concurrency` syntax #32751

Zettat123 commented Dec 7, 2024 •

edited

Loading

ChristopherHX Feb 28, 2025 •

edited

Loading

ChristopherHX Feb 28, 2025 •

edited

Loading