Merge pull request #468 from depot/watts/fix-ci-run-sha-with-patch

121watts · web-flow · commit 876fc6215b00 · 2026-03-26T09:19:59.000-05:00
fix: send merge base SHA when patch is present in depot ci run
diff --git a/pkg/cmd/ci/run.go b/pkg/cmd/ci/run.go
@@ -213,7 +213,9 @@ This command is in beta and subject to change.`,
 				WorkflowContent: []string{string(yamlBytes)},
 			}
 
-			if headSHA, err := resolveHEAD(workflowDir); err == nil {
+			if patch != nil {
+				req.Sha = &patch.mergeBase
+			} else if headSHA, err := resolveHEAD(workflowDir); err == nil {
 				req.Sha = &headSHA
 			}
 

Original file line number	Diff line number	Diff line change
@@ -213,7 +213,9 @@ This command is in beta and subject to change.`,
`213`	`213`	`WorkflowContent: []string{string(yamlBytes)},`
`214`	`214`	`}`
`215`	`215`
`216`		`- if headSHA, err := resolveHEAD(workflowDir); err == nil {`
	`216`	`+ if patch != nil {`
	`217`	`+ req.Sha = &patch.mergeBase`
	`218`	`+ } else if headSHA, err := resolveHEAD(workflowDir); err == nil {`
`217`	`219`	`req.Sha = &headSHA`
`218`	`220`	`}`
`219`	`221`