From 31f4401351eef9fcffcaeebfd3d7e0bb8236fc66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <aditya@netroy.in>
Date: Wed, 25 Sep 2024 14:47:14 +0200
Subject: [PATCH] disable "Merge back into master" step in the release process
 (no-changelog)

this doesn't work
---
 .github/workflows/release-publish.yml | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 7702fbff92..c3548a0cda 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -128,19 +128,19 @@ jobs:
       - name: Trigger a release note
         run: curl -u docsWorkflows:${{ secrets.N8N_WEBHOOK_DOCS_PASSWORD }} --request GET 'https://internal.users.n8n.cloud/webhook/trigger-release-note' --header 'Content-Type:application/json' --data '{"version":"${{ needs.publish-to-npm.outputs.release }}"}'
 
-  merge-back-into-master:
-    name: Merge back into master
-    needs: [publish-to-npm, create-github-release]
-    if: ${{ github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'release:patch') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-      - run: |
-          git checkout --track origin/master
-          git config user.name "github-actions[bot]"
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-          git merge --ff n8n@${{ needs.publish-to-npm.outputs.release }}
-          git push origin master
-          git push origin :${{github.event.pull_request.base.ref}}
+  # merge-back-into-master:
+  #   name: Merge back into master
+  #   needs: [publish-to-npm, create-github-release]
+  #   if: ${{ github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'release:patch') }}
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4.1.1
+  #       with:
+  #         fetch-depth: 0
+  #     - run: |
+  #         git checkout --track origin/master
+  #         git config user.name "github-actions[bot]"
+  #         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+  #         git merge --ff n8n@${{ needs.publish-to-npm.outputs.release }}
+  #         git push origin master
+  #         git push origin :${{github.event.pull_request.base.ref}}