Revert "Remove old autofix logic"

.changeset/little-carpets-jog.md

@@ -0,0 +1,9 @@
+---
+'skuba': patch
+---
+
+lint, format: Put back [logic](https://github.com/seek-oss/skuba/pull/1226/) which skips autofixing Renovate branches when there is no open pull request.
+
+Previously, this was put in place to prevent an issue where a Renovate branch can get stuck in the `Edited/Blocked` state without a pull request being raised. This was subsequently removed because Skuba's default autofix commits [were ignored by skuba's recommended renovate configuration](https://github.com/seek-oss/rynovate/pull/121).
+
+However, this has resulted in some build-rebase-build-rebase-... loops, and so the [Renovate config change has been reverted](https://github.com/seek-oss/rynovate/pull/125), and requires investigation before reinstating.

src/cli/lint/autofix.test.ts

@@ -1,5 +1,6 @@
 import simpleGit from 'simple-git';
 
+import * as Buildkite from '../../api/buildkite';
 import * as Git from '../../api/git';
 import * as GitHub from '../../api/github';
 import { runESLint } from '../adapter/eslint';
@@ -16,6 +17,7 @@ import { internalLint } from './internal';
 jest.mock('simple-git');
 jest.mock('../../api/git');
 jest.mock('../../api/github');
+jest.mock('../../api/buildkite');
 jest.mock('../adapter/eslint');
 jest.mock('../adapter/prettier');
 jest.mock('./internal');
@@ -123,6 +125,23 @@ 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();
+
+      expect(Buildkite.annotate).toHaveBeenCalled();
+
+      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);

src/cli/lint/autofix.ts

@@ -2,6 +2,7 @@ import { inspect } from 'util';
 
 import simpleGit from 'simple-git';
 
+import * as Buildkite from '../../api/buildkite';
 import * as Git from '../../api/git';
 import * as GitHub from '../../api/github';
 import { isCiEnv } from '../../utils/env';
@@ -15,6 +16,8 @@ import { createDestinationFileReader } from '../configure/analysis/project';
 import { internalLint } from './internal';
 import type { Input } from './types';
 
+const RENOVATE_DEFAULT_PREFIX = 'renovate';
+
 const AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';
 
 export const AUTOFIX_IGNORE_FILES_BASE: Git.ChangedFile[] = [
@@ -63,6 +66,21 @@ const shouldPush = async ({
     return false;
   }
 
+  if (currentBranch?.startsWith(RENOVATE_DEFAULT_PREFIX)) {
+    try {
+      await GitHub.getPullRequestNumber();
+    } catch {
+      const warning =
+        'An autofix is available, but it was not pushed because an open pull request for this Renovate branch could not be found. If a pull request has since been created, retry the lint step to push the fix.';
+      log.warn(warning);
+      try {
+        await Buildkite.annotate(Buildkite.md.terminal(warning));
+      } catch {}
+
+      return false;
+    }
+  }
+
   let headCommitMessage;
   try {
     headCommitMessage = await Git.getHeadCommitMessage({ dir });