From c714fa9bfea203052c0e6f8b85a92d631e3dbbb4 Mon Sep 17 00:00:00 2001
From: dbudzins <dbudzinski@jwplayer.com>
Date: Thu, 30 Nov 2023 12:58:41 +0100
Subject: [PATCH] chore: fix github actions

---
 .github/workflows/release-merge-back.yml      | 24 +++++++++++++++++++
 ...uild.yml => release-tag-build-release.yml} | 11 +--------
 2 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/release-merge-back.yml
 rename .github/workflows/{release-tag-and-build.yml => release-tag-build-release.yml} (84%)

diff --git a/.github/workflows/release-merge-back.yml b/.github/workflows/release-merge-back.yml
new file mode 100644
index 000000000..2616fe2f8
--- /dev/null
+++ b/.github/workflows/release-merge-back.yml
@@ -0,0 +1,24 @@
+name: Release - Merge Back to Dev
+on:
+  workflow_run:
+    workflows: ['Release - Tag, Build Artifacts, and Release']
+    branches: [release]
+    types:
+      - completed
+  workflow_dispatch:
+
+jobs:
+  merge-back:
+    if: ${{ !github.event.workflow_run || github.event.workflow_run.conclusion == 'success' }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge release -> develop
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          target_branch: develop
+          message: 'chore: merge release to develop'
+          github_token: ${{ secrets.ACTION_TOKEN }}
diff --git a/.github/workflows/release-tag-and-build.yml b/.github/workflows/release-tag-build-release.yml
similarity index 84%
rename from .github/workflows/release-tag-and-build.yml
rename to .github/workflows/release-tag-build-release.yml
index b5ba3ad30..f7613ed44 100644
--- a/.github/workflows/release-tag-and-build.yml
+++ b/.github/workflows/release-tag-build-release.yml
@@ -1,4 +1,4 @@
-name: Release - Build Artifacts, Tag, Release, and Merge Back
+name: Release - Tag, Build Artifacts, and Release
 
 on:
   workflow_dispatch:
@@ -55,12 +55,3 @@ jobs:
           tag: v${{ steps.package-version.outputs.current-version }}
           bodyFile: '.github/RELEASE_BODY_TEMPLATE.md'
           token: ${{ secrets.github_token }}
-
-      - name: Merge release -> develop
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          target_branch: develop
-          message: 'chore: merge release to develop'
-          github_token: ${{ secrets.ACTION_TOKEN }}
-