Merge pull request #3749 from ActiveState/mitchell/cp-1077

mitchell-as · web-flow · commit 4fa93d75b178 · 2025-09-23T12:22:02.000-04:00
After dynamically evaluating a build plan, staging a commit needs to use the latest timestamp.
diff --git a/internal/runbits/reqop_runbit/update.go b/internal/runbits/reqop_runbit/update.go
@@ -75,6 +75,12 @@ func UpdateAndReload(prime primeable, script *buildscript.BuildScript, oldCommit
 		if err := script.SetDynamic(false); err != nil {
 			return errs.Wrap(err, "Setting dynamic failed")
 		}
+		// StageCommitAndPoll needs to be called with atTime=now, not the previous script's atTime.
+		latest, err := model.FetchLatestRevisionTimeStamp(prime.Auth())
+		if err != nil {
+			return errs.Wrap(err, "Failed to fetch latest timestamp")
+		}
+		script.SetAtTime(latest, true)
 	}
 
 	commitParams := buildplanner.StageCommitParams{

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,12 @@ func UpdateAndReload(prime primeable, script *buildscript.BuildScript, oldCommit`
`75`	`75`	`if err := script.SetDynamic(false); err != nil {`
`76`	`76`	`return errs.Wrap(err, "Setting dynamic failed")`
`77`	`77`	`}`
	`78`	`+ // StageCommitAndPoll needs to be called with atTime=now, not the previous script's atTime.`
	`79`	`+ latest, err := model.FetchLatestRevisionTimeStamp(prime.Auth())`
	`80`	`+ if err != nil {`
	`81`	`+ return errs.Wrap(err, "Failed to fetch latest timestamp")`
	`82`	`+ }`
	`83`	`+ script.SetAtTime(latest, true)`
`78`	`84`	`}`
`79`	`85`
`80`	`86`	`commitParams := buildplanner.StageCommitParams{`