feat: Allow for passing custom merge target

.github/workflows/publish.yml

@@ -72,6 +72,7 @@ jobs:
             exec craft publish ${{ fromJSON(steps.inputs.outputs.result).version }};
             "
         env:
+          CRAFT_MERGE_TARGET: ${{ fromJSON(steps.inputs.outputs.result).merge_target }}
           CRAFT_LOG_LEVEL: ${{ secrets.CRAFT_LOG_LEVEL }}
           CRAFT_DRY_RUN: ${{ fromJSON(steps.inputs.outputs.result).dry_run }}
           GIT_COMMITTER_NAME: getsentry-bot

src/publish/__tests__/fail.js

@@ -70,6 +70,8 @@ beforeAll(() => {
       body: `
 Requested by: @BYK
 
+Merge target: (default)
+
 Quick links:
 - [View changes](https://github.com/getsentry/sentry/compare/21.3.0...refs/heads/releases/21.3.1)
 - [View check runs](https://github.com/getsentry/sentry/commit/7e5ca7ed5581552de066e2a8bc295b8306be38ac/checks/)
@@ -141,6 +143,8 @@ describe.each([false, true])("state file exists: %s", (stateFileExists) => {
           Object {
             "body": "
         Requested by: @BYK
+
+        Merge target: (default)
 
         Quick links:
         - [View changes](https://github.com/getsentry/sentry/compare/21.3.0...refs/heads/releases/21.3.1)

src/publish/__tests__/inputs.js

@@ -29,6 +29,8 @@ const inputsArgs = deepFreeze({
         body: `
 Requested by: @BYK
 
+Merge target: custom-branch
+
 Quick links:
 - [View changes](https://github.com/getsentry/sentry/compare/21.3.0...refs/heads/releases/21.3.1)
 - [View check runs](https://github.com/getsentry/sentry/commit/7e5ca7ed5581552de066e2a8bc295b8306be38ac/checks/)
@@ -52,6 +54,51 @@ test("parse inputs", async () => {
   expect(result).toMatchInlineSnapshot(`
     Object {
       "dry_run": "",
+      "merge_target": "custom-branch",
+      "path": ".",
+      "repo": "sentry",
+      "targets": Array [
+        "github",
+        "docker[latest]",
+      ],
+      "version": "21.3.1",
+    }
+  `);
+});
+
+
+const defaultTargetInputsArgs = deepFreeze({
+  context: {
+    repo: { owner: "getsentry", repo: "publish" },
+    payload: {
+      issue: {
+        number: "223",
+        title: "publish: getsentry/[email protected]",
+        body: `
+Requested by: @BYK
+Merge target: (default)
+Quick links:
+- [View changes](https://github.com/getsentry/sentry/compare/21.3.0...refs/heads/releases/21.3.1)
+- [View check runs](https://github.com/getsentry/sentry/commit/7e5ca7ed5581552de066e2a8bc295b8306be38ac/checks/)
+Assign the **accepted** label to this issue to approve the release.
+### Targets\r
+ - [x] github\r
+ - [ ] pypi\r
+ - [ ] docker[release]
+ - [x] docker[latest]\r
+`,
+        labels: ["accepted"],
+      },
+    },
+  },
+});
+
+test("Do not extract merge_target value if its a default value", async () => {
+  const result = await inputs(defaultTargetInputsArgs);
+  expect(result).toMatchInlineSnapshot(`
+    Object {
+      "dry_run": "",
+      "merge_target": "",
       "path": ".",
       "repo": "sentry",
       "targets": Array [

src/publish/inputs.js

@@ -6,6 +6,16 @@ exports.default = async function inputs({ context }) {
     : "";
   const path = "." + (titleMatch.path || "");
 
+  // https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags
+  const mergeTargetParser = /^Merge target: (?<merge_target>[\w.\-/]+)$/m;
+  const mergeTargetMatch = context.payload.issue.body.match(
+    mergeTargetParser
+  )
+  let merge_target = '';
+  if (mergeTargetMatch && mergeTargetMatch.groups) {
+    merge_target = mergeTargetMatch.groups.merge_target || ''
+  }
+
   const targetsParser = /^(?!### Targets$\s)(?: *- \[[ x]\] [\w.[\]-]+$(?:\r?\n)?)+/m;
   const targetsMatch = context.payload.issue.body.match(targetsParser);
   let targets;
@@ -16,5 +26,5 @@ exports.default = async function inputs({ context }) {
     );
   }
 
-  return { ...titleMatch, path, dry_run, targets };
+  return { ...titleMatch, merge_target, path, dry_run, targets };
 };