Skip to content

Commit a1d070c

Browse files
committed
fix test
1 parent 94ffa82 commit a1d070c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tests/integration/actions_concurrency_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ on:
5757
paths:
5858
- '.gitea/workflows/concurrent-workflow-1.yml'
5959
concurrency:
60-
group: workflow-main-abc123
60+
group: workflow-main-abc123-user2
6161
jobs:
6262
wf1-job:
6363
runs-on: ubuntu-latest
@@ -71,7 +71,7 @@ on:
7171
paths:
7272
- '.gitea/workflows/concurrent-workflow-2.yml'
7373
concurrency:
74-
group: workflow-${{ github.ref_name }}-${{ vars.myvar }}
74+
group: workflow-${{ gitea.ref_name }}-${{ vars.myvar }}-${{ gitea.event.pusher.username }}
7575
jobs:
7676
wf2-job:
7777
runs-on: ubuntu-latest
@@ -85,7 +85,7 @@ on:
8585
paths:
8686
- '.gitea/workflows/concurrent-workflow-3.yml'
8787
concurrency:
88-
group: workflow-main-abc${{ 123 }}
88+
group: workflow-main-abc${{ 123 }}-${{ gitea.event.pusher.username }}
8989
jobs:
9090
wf3-job:
9191
runs-on: ubuntu-latest
@@ -102,7 +102,7 @@ jobs:
102102
// fetch and exec workflow1, workflow2 and workflow3 are blocked
103103
task := runner.fetchTask(t)
104104
_, _, run := getTaskAndJobAndRunByTaskID(t, task.Id)
105-
assert.Equal(t, "workflow-main-abc123", run.ConcurrencyGroup)
105+
assert.Equal(t, "workflow-main-abc123-user2", run.ConcurrencyGroup)
106106
assert.Equal(t, "concurrent-workflow-1.yml", run.WorkflowID)
107107
runner.fetchNoTask(t)
108108
runner.execTask(t, task, &mockTaskOutcome{
@@ -115,7 +115,7 @@ jobs:
115115
_, _, run = getTaskAndJobAndRunByTaskID(t, task.Id)
116116
assert.Contains(t, workflowNames, run.WorkflowID)
117117
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)
119119
runner.fetchNoTask(t)
120120
runner.execTask(t, task, &mockTaskOutcome{
121121
result: runnerv1.Result_RESULT_SUCCESS,
@@ -124,7 +124,7 @@ jobs:
124124
// fetch the last workflow (workflow2 or workflow3)
125125
task = runner.fetchTask(t)
126126
_, _, run = getTaskAndJobAndRunByTaskID(t, task.Id)
127-
assert.Equal(t, "workflow-main-abc123", run.ConcurrencyGroup)
127+
assert.Equal(t, "workflow-main-abc123-user2", run.ConcurrencyGroup)
128128
assert.Equal(t, workflowNames[0], run.WorkflowID)
129129
runner.fetchNoTask(t)
130130
runner.execTask(t, task, &mockTaskOutcome{
@@ -157,7 +157,7 @@ func TestPullRequestWorkflowConcurrency(t *testing.T) {
157157
on: pull_request
158158
concurrency:
159159
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/') }}
161161
jobs:
162162
wf1-job:
163163
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)