Skip to content

Commit 06b5215

Browse files
committed
fix
1 parent cca20fb commit 06b5215

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

services/actions/concurrency.go

+4-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package actions
55

66
import (
7-
"bytes"
87
"fmt"
98

109
actions_model "code.gitea.io/gitea/models/actions"
@@ -28,26 +27,14 @@ func evaluateJobConcurrency(run *actions_model.ActionRun, actionRunJob *actions_
2827
return "", false, fmt.Errorf("not single workflow")
2928
}
3029

31-
// FIXME: cannot get job needs
32-
singleWorkflow := singleWorkflows[0]
33-
singleWorkflow.Job()
34-
actJobMap := map[string]*act_model.Job{}
35-
if err := singleWorkflow.RawJobs.Decode(&actJobMap); err != nil {
36-
return "", false, fmt.Errorf("decode act job: %w", err)
37-
}
38-
39-
actWorkflow, err := act_model.ReadWorkflow(bytes.NewReader(actionRunJob.WorkflowPayload))
40-
if err != nil {
41-
return "", false, fmt.Errorf("read workflow: %w", err)
42-
}
43-
actJob := actWorkflow.GetJob(actionRunJob.JobID)
44-
4530
if jobResults == nil {
4631
jobResults = map[string]*jobparser.JobResult{}
4732
}
48-
jobResults[actionRunJob.JobID] = &jobparser.JobResult{}
33+
jobResults[actionRunJob.JobID] = &jobparser.JobResult{
34+
Needs: actionRunJob.Needs,
35+
}
4936

50-
concurrencyGroup, concurrencyCancel := jobparser.EvaluateJobConcurrency(rawConcurrency, actionRunJob.JobID, actJob, gitCtx, vars, jobResults)
37+
concurrencyGroup, concurrencyCancel := jobparser.EvaluateJobConcurrency(rawConcurrency, actionRunJob.JobID, gitCtx, vars, jobResults)
5138

5239
return concurrencyGroup, concurrencyCancel, nil
5340
}

0 commit comments

Comments
 (0)