From e8b51c8da9beecc1f4f95eb9528c8aa29f0f7222 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?=
 <netroy@users.noreply.github.com>
Date: Fri, 2 Jun 2023 12:18:32 +0000
Subject: [PATCH] ci: Update the release process for v1 release (#6366)

* release 1.0.0-rc from release-v1 branch.
* allow creating major releases
* disable merging releases back into master
---
 .github/workflows/docker-image-v1-rc.yml |  1 +
 .github/workflows/release-create-pr.yml  |  1 +
 .github/workflows/release-publish.yml    | 18 +++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-image-v1-rc.yml b/.github/workflows/docker-image-v1-rc.yml
index b54fc162a3..1b1b55fbe6 100644
--- a/.github/workflows/docker-image-v1-rc.yml
+++ b/.github/workflows/docker-image-v1-rc.yml
@@ -12,6 +12,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          ref: release-v1
 
       - uses: pnpm/action-setup@v2.2.4
       - uses: actions/setup-node@v3
diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
index cb0f359f45..eb469deef2 100644
--- a/.github/workflows/release-create-pr.yml
+++ b/.github/workflows/release-create-pr.yml
@@ -16,6 +16,7 @@ on:
         options:
           - patch
           - minor
+          - major
 
 jobs:
   create-release-pr:
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 25fb683adc..2d141e9f22 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -55,12 +55,12 @@ jobs:
         continue-on-error: true
         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":"${{env.RELEASE}}"}'
 
-      - name: Merge Release into 'master'
-        run: |
-          git fetch origin
-          git checkout --track origin/master
-          git config user.name "Jan Oberhauser"
-          git config user.email jan.oberhauser@gmail.com
-          git merge --ff n8n@${{env.RELEASE}}
-          git push origin master
-          git push origin :${{github.event.pull_request.base.ref}}
+      # - name: Merge Release into 'master'
+      #   run: |
+      #     git fetch origin
+      #     git checkout --track origin/master
+      #     git config user.name "Jan Oberhauser"
+      #     git config user.email jan.oberhauser@gmail.com
+      #     git merge --ff n8n@${{env.RELEASE}}
+      #     git push origin master
+      #     git push origin :${{github.event.pull_request.base.ref}}