57
57
paths:
58
58
- '.gitea/workflows/concurrent-workflow-1.yml'
59
59
concurrency:
60
- group: workflow-main-abc123
60
+ group: workflow-main-abc123-user2
61
61
jobs:
62
62
wf1-job:
63
63
runs-on: ubuntu-latest
71
71
paths:
72
72
- '.gitea/workflows/concurrent-workflow-2.yml'
73
73
concurrency:
74
- group: workflow-${{ github .ref_name }}-${{ vars.myvar }}
74
+ group: workflow-${{ gitea .ref_name }}-${{ vars.myvar }}-${{ gitea.event.pusher.username }}
75
75
jobs:
76
76
wf2-job:
77
77
runs-on: ubuntu-latest
85
85
paths:
86
86
- '.gitea/workflows/concurrent-workflow-3.yml'
87
87
concurrency:
88
- group: workflow-main-abc${{ 123 }}
88
+ group: workflow-main-abc${{ 123 }}-${{ gitea.event.pusher.username }}
89
89
jobs:
90
90
wf3-job:
91
91
runs-on: ubuntu-latest
@@ -102,7 +102,7 @@ jobs:
102
102
// fetch and exec workflow1, workflow2 and workflow3 are blocked
103
103
task := runner .fetchTask (t )
104
104
_ , _ , run := getTaskAndJobAndRunByTaskID (t , task .Id )
105
- assert .Equal (t , "workflow-main-abc123" , run .ConcurrencyGroup )
105
+ assert .Equal (t , "workflow-main-abc123-user2 " , run .ConcurrencyGroup )
106
106
assert .Equal (t , "concurrent-workflow-1.yml" , run .WorkflowID )
107
107
runner .fetchNoTask (t )
108
108
runner .execTask (t , task , & mockTaskOutcome {
@@ -115,7 +115,7 @@ jobs:
115
115
_ , _ , run = getTaskAndJobAndRunByTaskID (t , task .Id )
116
116
assert .Contains (t , workflowNames , run .WorkflowID )
117
117
workflowNames = slices .DeleteFunc (workflowNames , func (wfn string ) bool { return wfn == run .WorkflowID })
118
- assert .Equal (t , "workflow-main-abc123" , run .ConcurrencyGroup )
118
+ assert .Equal (t , "workflow-main-abc123-user2 " , run .ConcurrencyGroup )
119
119
runner .fetchNoTask (t )
120
120
runner .execTask (t , task , & mockTaskOutcome {
121
121
result : runnerv1 .Result_RESULT_SUCCESS ,
@@ -124,7 +124,7 @@ jobs:
124
124
// fetch the last workflow (workflow2 or workflow3)
125
125
task = runner .fetchTask (t )
126
126
_ , _ , run = getTaskAndJobAndRunByTaskID (t , task .Id )
127
- assert .Equal (t , "workflow-main-abc123" , run .ConcurrencyGroup )
127
+ assert .Equal (t , "workflow-main-abc123-user2 " , run .ConcurrencyGroup )
128
128
assert .Equal (t , workflowNames [0 ], run .WorkflowID )
129
129
runner .fetchNoTask (t )
130
130
runner .execTask (t , task , & mockTaskOutcome {
@@ -157,7 +157,7 @@ func TestPullRequestWorkflowConcurrency(t *testing.T) {
157
157
on: pull_request
158
158
concurrency:
159
159
group: pull-request-test
160
- cancel-in-progress: ${{ !startsWith(github .head_ref, 'do-not-cancel/') }}
160
+ cancel-in-progress: ${{ !startsWith(gitea .head_ref, 'do-not-cancel/') }}
161
161
jobs:
162
162
wf1-job:
163
163
runs-on: ubuntu-latest
0 commit comments