Update PR before trying to merge it

It probably makes sense to do things in this order rather than how we were doing it before.
palantir · Apr 8, 2021 · 6b18729 · 6b18729
1 parent c4ba980
commit 6b18729
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/server/handler/pull_request.go b/server/handler/pull_request.go
@@ -68,9 +68,6 @@ func (h *PullRequest) Handle(ctx context.Context, eventType, deliveryID string,
 	if err != nil {
 		return err
 	}
-	if err := h.ProcessPullRequest(ctx, pullCtx, client, config, pr); err != nil {
-		logger.Error().Err(errors.WithStack(err)).Msg("Error processing pull request")
-	}
 
 	if event.GetAction() == "labeled" || event.GetAction() == "opened" {
 		base, _ := pullCtx.Branches()
@@ -79,6 +76,10 @@ func (h *PullRequest) Handle(ctx context.Context, eventType, deliveryID string,
 		}
 	}
 
+	if err := h.ProcessPullRequest(ctx, pullCtx, client, config, pr); err != nil {
+		logger.Error().Err(errors.WithStack(err)).Msg("Error processing pull request")
+	}
+
 	return nil
 }