From e2aa54701f648fc83dd59b37a8d9da08fdc56df5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 16 Feb 2022 20:13:41 +0800
Subject: [PATCH] feat: add sync-to-develop

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .github/workflows/release-nocodb.yml  | 22 +++++++++++++++-------
 .github/workflows/sync-to-develop.yml | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/sync-to-develop.yml

diff --git a/.github/workflows/release-nocodb.yml b/.github/workflows/release-nocodb.yml
index cc6968ff54..908b2dac30 100644
--- a/.github/workflows/release-nocodb.yml
+++ b/.github/workflows/release-nocodb.yml
@@ -11,11 +11,6 @@ on:
         description: "Previous Tag"
         required: true
 jobs:
-  # Build, install, publish frontend and backend to npm
-  release-npm:
-    uses: ./.github/workflows/release-npm.yml
-    with:
-      tag: tag
   # Close all issues with target tags 'Fixed' & 'Resolved'
   # TODO: add 'Fixed in vX.Y.Z' comment after closing.
   close-fixed-issues:
@@ -28,16 +23,29 @@ jobs:
     uses: ./.github/workflows/release-close-issue.yml
     with:
       issue_label: 'Resolved'
+
+  # Build, install, publish frontend and backend to npm
+  release-npm:
+    uses: ./.github/workflows/release-npm.yml
+    with:
+      tag: tag
+
   # Draft Release Note
   release-draft-note:
     needs: close-issues
-    users: ./.github/workflows/release-draft.yml
+    uses: ./.github/workflows/release-draft.yml
     with:
       tag: tag
       prev_tag: prev_tag
+
   # Build docker image and push to docker hub
   release-docker:
     needs: release-draft-note
-    users: ./.gitjib/workflows/release-docker.yml
+    uses: ./.github/workflows/release-docker.yml
     with:
       tag: tag
+
+  # Sync changes to develop
+  sync-to-develop:
+    needs: release-docker
+    uses: ./.github/workflows/sync-to-develop.yml
\ No newline at end of file
diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml
new file mode 100644
index 0000000000..74fa9837ec
--- /dev/null
+++ b/.github/workflows/sync-to-develop.yml
@@ -0,0 +1,20 @@
+name: 'Sync changes back to develop branch'
+
+on:
+  # Triggered manually
+  workflow_dispatch:
+  # Triggered by release-nocodb.yml
+  workflow_call:
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge master -> develop
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: master
+          target_branch: develop
+          github_token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file