Allow ops-bot to merge to main if main is the default branch. (#188)

rapidsai · Jul 9, 2024 · bacc3c5 · bacc3c5
1 parent e236fc8
commit bacc3c5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/plugins/AutoMerger/auto_merger.ts b/src/plugins/AutoMerger/auto_merger.ts
@@ -56,7 +56,7 @@ export class AutoMerger extends OpsBotPlugin {
       });
 
       // Check if PR is mergeable (all green)
-      if (!this.isPrMergeable(pr)) {
+      if (!this.isPrMergeable(pr, repo.default_branch)) {
         this.logger.info({ pr }, "PR not mergeable");
         return;
       }
@@ -97,14 +97,14 @@ export class AutoMerger extends OpsBotPlugin {
    *
    * @param pr
    */
-  isPrMergeable(pr: PullsGetResponseData): boolean {
+  isPrMergeable(pr: PullsGetResponseData, default_branch: string): boolean {
     const mergeable_state = pr.mergeable_state;
     const mergeable = pr.mergeable;
     const baseRef = pr.base.ref;
     return (
       (mergeable_state === "clean" || mergeable_state === "unstable") &&
       mergeable === true &&
-      baseRef !== "main"
+      (baseRef !== "main" || default_branch === "main")
     );
   }