Skip autofix on pending Renovate Branches

.changeset/mighty-buttons-fry.md

@@ -0,0 +1,7 @@
+---
+'skuba': minor
+---
+
+lint/format: Skip autofixing on `renovate-skuba-` branches when there is no open pull request for the associated branch.
+
+This prevents an issue where a Renovate branch can get stuck in the `Edited/Blocked` state without a pull request being raised.

src/cli/lint/autofix.test.ts

@@ -105,6 +105,30 @@ describe('autofix', () => {
       expectNoAutofix();
     });
 
+    it('bails on a renovate- branch when there is no open pull request', async () => {
+      jest.mocked(Git.currentBranch).mockResolvedValue('renovate-skuba-7.x');
+      jest
+        .mocked(GitHub.getPullRequestNumber)
+        .mockRejectedValue(
+          new Error(
+            `Commit cdd1520 is not associated with an open GitHub pull request`,
+          ),
+        );
+
+      await expect(autofix(params)).resolves.toBeUndefined();
+
+      expectNoAutofix();
+    });
+
+    it('suceeds on a renovate- branch when there is an open pull request associated with the commit', async () => {
+      jest.mocked(Git.currentBranch).mockResolvedValue('renovate-skuba-7.x');
+      jest.mocked(GitHub.getPullRequestNumber).mockResolvedValue(6);
+
+      await expect(autofix(params)).resolves.toBeUndefined();
+
+      expectAutofixCommit();
+    });
+
     it('bails on a GitHub protected branch', async () => {
       process.env.GITHUB_REF_PROTECTED = 'true';
 

src/cli/lint/autofix.ts

@@ -18,6 +18,8 @@ import { REFRESHABLE_IGNORE_FILES } from '../configure/refreshIgnoreFiles';
 
 import type { Input } from './types';
 
+const RENOVATE_DEFAULT_PREFIX = 'renovate-skuba-';
+
 const AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';
 
 const AUTOFIX_DELETE_FILES = [
@@ -79,6 +81,17 @@ const shouldPush = async ({
     return false;
   }
 
+  if (currentBranch?.startsWith(RENOVATE_DEFAULT_PREFIX)) {
+    try {
+      await GitHub.getPullRequestNumber();
+    } catch (error) {
+      log.warn(
+        'Could not find an open pull request for this branch. The autofix commit will not be applied to allow Renovate to open a pull request successfully.',
+      );
+      return false;
+    }
+  }
+
   let headCommitMessage;
   try {
     headCommitMessage = await Git.getHeadCommitMessage({ dir });