TestMatrixConcurrency

Author: Zettat123

services/actions/run.go

@@ -115,11 +115,11 @@ func InsertRun(ctx context.Context, run *actions_model.ActionRun, jobs []*jobpar
 			}
 		}
 
-		runJobs = append(runJobs, runJob)
-	}
+		if err := db.Insert(ctx, runJob); err != nil {
+			return err
+		}
 
-	if err := db.Insert(ctx, runJobs); err != nil {
-		return err
+		runJobs = append(runJobs, runJob)
 	}
 
 	run.Status = actions_model.AggregateJobStatus(runJobs)

tests/integration/actions_concurrency_test.go

@@ -402,6 +402,86 @@ jobs:
 	})
 }
 
+func TestMatrixConcurrency(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		session := loginUser(t, user2.Name)
+		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+
+		apiRepo := createActionsTestRepo(t, token, "actions-concurrency", false)
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID})
+		httpContext := NewAPITestContext(t, user2.Name, repo.Name, auth_model.AccessTokenScopeWriteRepository)
+		defer doAPIDeleteRepository(httpContext)(t)
+
+		linuxRunner := newMockRunner()
+		linuxRunner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-linux-runner", []string{"linux-runner"})
+		windowsRunner := newMockRunner()
+		windowsRunner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-windows-runner", []string{"windows-runner"})
+		darwinRunner := newMockRunner()
+		darwinRunner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-darwin-runner", []string{"darwin-runner"})
+
+		wf1TreePath := ".gitea/workflows/concurrent-workflow-1.yml"
+		wf1FileContent := `name: concurrent-workflow-1
+on: 
+  push:
+    paths:
+      - '.gitea/workflows/concurrent-workflow-1.yml'
+jobs:
+  job1:
+    runs-on: ${{ matrix.os }}-runner
+    strategy:
+      matrix:
+        os: [windows, linux]
+    concurrency:
+      group: job-os-${{ matrix.os }}
+    steps:
+      - run: echo 'job1'
+  job2:
+    runs-on: ${{ matrix.os }}-runner
+    strategy:
+      matrix:
+        os: [darwin, windows, linux]
+    concurrency:
+      group: job-os-${{ matrix.os }}
+    steps:
+      - run: echo 'job2'
+`
+
+		opts1 := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("create %s", wf1TreePath), wf1FileContent)
+		createWorkflowFile(t, token, user2.Name, repo.Name, wf1TreePath, opts1)
+
+		job1WinTask := windowsRunner.fetchTask(t)
+		job1LinuxTask := linuxRunner.fetchTask(t)
+		windowsRunner.fetchNoTask(t)
+		linuxRunner.fetchNoTask(t)
+		job2DarwinTask := darwinRunner.fetchTask(t)
+		_, job1WinJob, _ := getTaskAndJobAndRunByTaskID(t, job1WinTask.Id)
+		assert.Equal(t, "job1 (windows)", job1WinJob.Name)
+		assert.Equal(t, "job-os-windows", job1WinJob.ConcurrencyGroup)
+		_, job1LinuxJob, _ := getTaskAndJobAndRunByTaskID(t, job1LinuxTask.Id)
+		assert.Equal(t, "job1 (linux)", job1LinuxJob.Name)
+		assert.Equal(t, "job-os-linux", job1LinuxJob.ConcurrencyGroup)
+		_, job2DarwinJob, _ := getTaskAndJobAndRunByTaskID(t, job2DarwinTask.Id)
+		assert.Equal(t, "job2 (darwin)", job2DarwinJob.Name)
+		assert.Equal(t, "job-os-darwin", job2DarwinJob.ConcurrencyGroup)
+		windowsRunner.execTask(t, job1WinTask, &mockTaskOutcome{
+			result: runnerv1.Result_RESULT_SUCCESS,
+		})
+		linuxRunner.execTask(t, job1LinuxTask, &mockTaskOutcome{
+			result: runnerv1.Result_RESULT_SUCCESS,
+		})
+
+		job2WinTask := windowsRunner.fetchTask(t)
+		job2LinuxTask := linuxRunner.fetchTask(t)
+		_, job2WinJob, _ := getTaskAndJobAndRunByTaskID(t, job2WinTask.Id)
+		assert.Equal(t, "job2 (windows)", job2WinJob.Name)
+		assert.Equal(t, "job-os-windows", job2WinJob.ConcurrencyGroup)
+		_, job2LinuxJob, _ := getTaskAndJobAndRunByTaskID(t, job2LinuxTask.Id)
+		assert.Equal(t, "job2 (linux)", job2LinuxJob.Name)
+		assert.Equal(t, "job-os-linux", job2LinuxJob.ConcurrencyGroup)
+	})
+}
+
 func TestWorkflowDispatchConcurrency(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})