fix: pull request is not mergeable (#27)

* use correct timeout

* move IsMergeable logic into should_skip logic

* remove unused parameter

Author: Eun

pkg/merge-with-label/worker/pull_request_worker.go

@@ -268,22 +268,6 @@ func (worker *pullRequestWorker) mergePullRequest(
 	if cfg.Merge.Labels.ContainsOneOf(details.Labels...) == "" {
 		return false, false, nil
 	}
-	if !details.IsMergeable {
-		rootLogger.Debug().Msg("pull request not mergeable")
-		if err := worker.CreateOrUpdateCheckRun(
-			ctx,
-			rootLogger,
-			accessToken,
-			repository,
-			details.ID,
-			details.LastCommitSha,
-			"COMPLETED",
-			"not merging: pull request is not mergeable", "",
-		); err != nil {
-			return false, false, errors.WithStack(err)
-		}
-		return true, false, nil
-	}
 
 	result, err := worker.shouldSkipMerge(ctx, rootLogger, cfg, details)
 	if err != nil {

pkg/merge-with-label/worker/should_skip.go

@@ -37,6 +37,7 @@ func (worker *Worker) shouldSkipMerge(
 		worker.shouldSkipBecauseOfHistory(&cfg.Merge),
 		worker.shouldSkipBecauseOfReviews(&cfg.Merge),
 		worker.shouldSkipBecauseOfChecks(&cfg.Merge),
+		worker.shouldSkipBecauseIsNotMergeable(&cfg.Merge),
 	}
 
 	for i := range conditions {
@@ -264,7 +265,7 @@ func (worker *Worker) shouldSkipBecauseOfChecks(cfg *MergeConfigV1) shouldSkipFu
 			}, nil
 		}
 
-		if diff := time.Until(details.LastCommitTime.Add(worker.DurationToWaitAfterUpdateBranch)); diff > 0 {
+		if diff := time.Until(details.LastCommitTime.Add(worker.DurationBeforeMergeAfterCheck)); diff > 0 {
 			// it's a bit too early. block merging, push back onto the queue
 			logger.Debug().Msg("delaying merge, because commit was too recent")
 			return shouldSkipResult{SkipAction: false}, pushBackError{delay: diff}
@@ -321,3 +322,23 @@ func (worker *Worker) shouldSkipBecauseOfReviews(cfg *MergeConfigV1) shouldSkipF
 		return shouldSkipResult{SkipAction: false}, nil
 	}
 }
+
+func (worker *Worker) shouldSkipBecauseIsNotMergeable(*MergeConfigV1) shouldSkipFunc {
+	return func(_ context.Context, logger *zerolog.Logger, details *github.PullRequestDetails) (shouldSkipResult, error) {
+		if details.IsMergeable {
+			return shouldSkipResult{SkipAction: false}, nil
+		}
+
+		if diff := time.Until(details.LastCommitTime.Add(worker.DurationBeforeMergeAfterCheck)); diff > 0 {
+			// it's a bit too early. block merging, push back onto the queue
+			logger.Debug().Msg("pull request not mergeable, but the the last commit is too recent, retrying")
+			return shouldSkipResult{SkipAction: false}, pushBackError{delay: diff}
+		}
+		logger.Debug().Msg("pull request not mergeable")
+		return shouldSkipResult{
+			SkipAction: true,
+			Title:      "not merging",
+			Summary:    "pull request is not mergeable",
+		}, nil
+	}
+}