TestJobNeedsMatrix

Author: Zettat123

tests/integration/actions_job_test.go

@@ -126,7 +126,6 @@ jobs:
 		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
 
 		apiRepo := createActionsTestRepo(t, token, "actions-jobs-with-needs", false)
-
 		runner := newMockRunner()
 		runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"})
 
@@ -163,6 +162,113 @@ jobs:
 	})
 }
 
+func TestJobNeedsMatrix(t *testing.T) {
+	testCases := []struct {
+		treePath        string
+		fileContent     string
+		execPolicies    map[string]*taskExecPolicy
+		expectedOutputs map[string]map[string]string // jobID(string) => output(map[string]string)
+	}{
+		{
+			treePath: ".gitea/workflows/jobs-outputs-with-matrix.yml",
+			fileContent: `name: jobs-outputs-with-matrix
+on: 
+  push:
+    paths:
+      - '.gitea/workflows/jobs-outputs-with-matrix.yml'
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    outputs:
+      output_1: ${{ steps.gen_output.outputs.output_1 }}
+      output_2: ${{ steps.gen_output.outputs.output_2 }}
+      output_3: ${{ steps.gen_output.outputs.output_3 }}
+    strategy:
+      matrix:
+        version: [1, 2, 3]
+    steps:
+      - name: Generate output
+        id: gen_output
+        run: |
+          version="${{ matrix.version }}"
+          echo "output_${version}=${version}" >> "$GITHUB_OUTPUT"          
+  job2:
+    runs-on: ubuntu-latest
+    needs: [job1]
+    steps:
+      - run: echo '${{ toJSON(needs.job1.outputs) }}'
+`,
+			execPolicies: map[string]*taskExecPolicy{
+				"job1 (1)": {
+					result: runnerv1.Result_RESULT_SUCCESS,
+					outputs: map[string]string{
+						"output_1": "1",
+						"output_2": "",
+						"output_3": "",
+					},
+				},
+				"job1 (2)": {
+					result: runnerv1.Result_RESULT_SUCCESS,
+					outputs: map[string]string{
+						"output_1": "",
+						"output_2": "2",
+						"output_3": "",
+					},
+				},
+				"job1 (3)": {
+					result: runnerv1.Result_RESULT_SUCCESS,
+					outputs: map[string]string{
+						"output_1": "",
+						"output_2": "",
+						"output_3": "3",
+					},
+				},
+			},
+			expectedOutputs: map[string]map[string]string{
+				"job1": {
+					"output_1": "1",
+					"output_2": "2",
+					"output_3": "3",
+				},
+			},
+		},
+	}
+	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-jobs-outputs-with-matrix", false)
+		runner := newMockRunner()
+		runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"})
+
+		for _, tc := range testCases {
+			t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
+				opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
+				createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts)
+
+				for i := 0; i < len(tc.execPolicies); i++ {
+					task := runner.fetchTask(t)
+					jobName := getTaskJobNameByTaskID(t, token, user2.Name, apiRepo.Name, task.Id)
+					policy := tc.execPolicies[jobName]
+					assert.NotNil(t, policy)
+					runner.execTask(t, task, policy)
+				}
+
+				job2Task := runner.fetchTask(t)
+				needs := job2Task.Needs
+				assert.Len(t, needs, len(tc.expectedOutputs))
+				for jobID, outputs := range tc.expectedOutputs {
+					assert.Len(t, needs[jobID].Outputs, len(outputs))
+					for outputKey, outputValue := range outputs {
+						assert.Equal(t, outputValue, needs[jobID].Outputs[outputKey])
+					}
+				}
+			})
+		}
+	})
+}
+
 func createActionsTestRepo(t *testing.T, authToken, repoName string, isPrivate bool) *api.Repository {
 	req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", &api.CreateRepoOption{
 		Name:          repoName,

tests/integration/actions_runner_test.go

@@ -137,7 +137,7 @@ func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, policy *taskExe
 		assert.NoError(t, err)
 		assert.EqualValues(t, idx+1, resp.Msg.AckIndex)
 	}
-	sentOutputs := make(map[string]string, len(policy.outputs))
+	sentOutputKeys := make([]string, 0, len(policy.outputs))
 	for outputKey, outputValue := range policy.outputs {
 		resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
 			State: &runnerv1.TaskState{
@@ -147,8 +147,8 @@ func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, policy *taskExe
 			Outputs: map[string]string{outputKey: outputValue},
 		}))
 		assert.NoError(t, err)
-		sentOutputs[outputKey] = outputValue
-		assert.True(t, reflect.DeepEqual(sentOutputs, resp.Msg.SentOutputs))
+		sentOutputKeys = append(sentOutputKeys, outputKey)
+		assert.True(t, reflect.DeepEqual(sentOutputKeys, resp.Msg.SentOutputs))
 	}
 	time.Sleep(policy.execTime)
 	resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{