Skip to content

Commit 2e8a66c

Browse files
authored
fix(api): remove addSpawnInfo from loop (#5112)
1 parent a64cb2f commit 2e8a66c

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

engine/api/workflow/dao.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,8 +1438,8 @@ func Push(ctx context.Context, db *gorp.DbMap, store cache.Store, proj *sdk.Proj
14381438
fromRepo = opts.FromRepository
14391439
}
14401440
envDB, msgList, err := environment.ParseAndImport(tx, *proj, env, environment.ImportOptions{Force: true, FromRepository: fromRepo}, decryptFunc, u)
1441-
allMsg = append(allMsg, msgList...)
1442-
if err != nil {
1441+
allMsg = append(allMsg, msgList...)
1442+
if err != nil {
14431443
return allMsg, nil, nil, sdk.ErrorWithFallback(err, sdk.ErrWrongRequest, "unable to import environment %s/%s", proj.Key, env.Name)
14441444
}
14451445
proj.SetEnvironment(*envDB)
@@ -1451,8 +1451,8 @@ func Push(ctx context.Context, db *gorp.DbMap, store cache.Store, proj *sdk.Proj
14511451
fromRepo = opts.FromRepository
14521452
}
14531453
pipDB, msgList, err := pipeline.ParseAndImport(ctx, tx, store, *proj, &pip, u, pipeline.ImportOptions{Force: true, FromRepository: fromRepo})
1454-
allMsg = append(allMsg, msgList...)
1455-
if err != nil {
1454+
allMsg = append(allMsg, msgList...)
1455+
if err != nil {
14561456
return allMsg, nil, nil, sdk.ErrorWithFallback(err, sdk.ErrWrongRequest, "unable to import pipeline %s/%s", proj.Key, pip.Name)
14571457
}
14581458
proj.SetPipeline(*pipDB)
@@ -1478,8 +1478,8 @@ func Push(ctx context.Context, db *gorp.DbMap, store cache.Store, proj *sdk.Proj
14781478
}
14791479

14801480
wf, msgList, err := ParseAndImport(ctx, tx, store, *proj, oldWf, data.Workflow, u, importOptions)
1481-
allMsg = append(allMsg, msgList...)
1482-
if err != nil {
1481+
allMsg = append(allMsg, msgList...)
1482+
if err != nil {
14831483
return allMsg, nil, nil, sdk.WrapError(err, "unable to import workflow %s", data.Workflow.GetName())
14841484
}
14851485

engine/api/workflow_run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,8 +1005,9 @@ func (api *API) initWorkflowRun(ctx context.Context, projKey string, wf *sdk.Wor
10051005
Args: msg.Args,
10061006
Type: msg.Type,
10071007
}
1008-
workflow.AddWorkflowRunInfo(wfRun, infos...)
1008+
10091009
}
1010+
workflow.AddWorkflowRunInfo(wfRun, infos...)
10101011
r1 := failInitWorkflowRun(ctx, api.mustDB(), wfRun, sdk.WrapError(err, "unable to get workflow from repository"))
10111012
report.Merge(ctx, r1)
10121013
return

0 commit comments

Comments
 (0)