Merge pull request #3630 from ActiveState/mitchell/dx-3205

mitchell-as · web-flow · commit 0213562de18c · 2025-01-17T16:00:52.000-05:00
Return a commit even if there's a polling error.
diff --git a/pkg/platform/model/buildplanner/commit.go b/pkg/platform/model/buildplanner/commit.go
@@ -72,7 +72,7 @@ func (b *BuildPlanner) StageCommit(params StageCommitParams) (*Commit, error) {
 	if resp.Build.Status == raw.Planning {
 		resp.Build, err = b.pollBuildPlanned(resp.CommitID.String(), params.Owner, params.Project, nil)
 		if err != nil {
-			return nil, errs.Wrap(err, "failed to poll build plan")
+			return &Commit{resp, nil, nil}, errs.Wrap(err, "failed to poll build plan")
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func (b BuildPlanner) StageCommit(params StageCommitParams) (Commit, error) {`
`72`	`72`	`if resp.Build.Status == raw.Planning {`
`73`	`73`	`resp.Build, err = b.pollBuildPlanned(resp.CommitID.String(), params.Owner, params.Project, nil)`
`74`	`74`	`if err != nil {`
`75`		`- return nil, errs.Wrap(err, "failed to poll build plan")`
	`75`	`+ return &Commit{resp, nil, nil}, errs.Wrap(err, "failed to poll build plan")`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`