[autoroll] Fix for GitHub rollers not landing CLs
Change-Id: I687be5591687432be1dc51269eebded0ad5283b1
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/229378
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/go/codereview/roll.go b/autoroll/go/codereview/roll.go
index 166d92f..8313fa9 100644
--- a/autoroll/go/codereview/roll.go
+++ b/autoroll/go/codereview/roll.go
@@ -430,7 +430,7 @@
return nil, fmt.Errorf("Could not close %d: %s", a.Issue, err)
}
pullRequestModified = true
- } else if a.DryRunFinished && a.DryRunSuccess && len(a.TryResults) >= checksNum && a.AllTrybotsSucceeded() && pullRequest.GetState() != github.CLOSED_STATE && shouldStateBeMerged(pullRequest.GetMergeableState()) {
+ } else if !a.IsDryRun && len(a.TryResults) >= checksNum && a.AllTrybotsSucceeded() && pullRequest.GetState() != github.CLOSED_STATE && shouldStateBeMerged(pullRequest.GetMergeableState()) {
// Github and travisci do not have a "commit queue". So changes must be
// merged via the API after travisci successfully completes.
if err := g.AddComment(int(a.Issue), "Auto-roller completed checks. About to merge."); err != nil {
