Fix auto-merge on checks with no checks

[changelog:fixed]
atomist-skills · Sep 10, 2020 · dd3250a · dd3250a
1 parent ca65521
commit dd3250a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/autoMerge.ts b/lib/autoMerge.ts
@@ -245,7 +245,11 @@ const CheckAutoMergeRule: AutoMergeRule = {
 				return false;
 			}
 		}
-		return true;
+		return !isPrTagged(
+			pr,
+			AutoMergeCheckSuccessLabel,
+			AutoMergeCheckSuccessTag,
+		);
 	},
 };
 
@@ -340,7 +344,7 @@ export async function executeAutoMerge(
 	if (pr.state !== "open") {
 		await ctx.audit.log(`Pull request auto-merge ignoring closed ${slug}`);
 		return status
-			.success(`Pull request auto-merge ignoring closed ${slug}`)
+			.success(`Pull request auto-merge ignoring closed ${link}`)
 			.hidden();
 	}
 
@@ -401,7 +405,7 @@ export async function executeAutoMerge(
 			)}`,
 		);
 		return status.success(
-			`Pull request auto-merge not enabled for ${slug}.`,
+			`Pull request auto-merge not enabled for ${link}.`,
 		);
 	}