feat(workflow-auto-merge-release-hotfix-into-develop): add new workflow for auto merging release/hotfix into develop (#26)

Author: ansidev

.github/workflows/auto_merge_release_hotfix_into_develop.yaml

@@ -0,0 +1,28 @@
+name: auto_merge_into_develop
+
+on:
+  pull_request:
+    types:
+      - opened
+    branches:
+      - develop
+
+env:
+  BRANCH_DEVELOP: develop
+
+jobs:
+  auto_merge_into_develop:
+    name: Merge release into develop
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    # only merge pull requests that begin with 'release/' or 'hotfix/'
+    if: startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'hotfix/')
+
+    steps:
+      - name: Merge PR
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+          PR_TITLE: Merge branch '${{ github.head_ref }}' into ${{ env.BRANCH_DEVELOP }}
+        run: |
+          gh pr merge ${PR_NUMBER} -m -d -t "${PR_TITLE}"

.github/workflows/release.yaml

@@ -77,6 +77,3 @@ jobs:
             --body "${{ env.PR_BODY }}" \
             --label "${{ env.PR_LABEL }}" \
             --fill
-
-          PR_ID=$(gh pr list --state open --search "base:${{ env.BRANCH_DEVELOP }} head:${{ github.head_ref }}" | head -1 | cut -f1)
-          [[ ! -z "$PR_ID" ]] && gh pr merge ${PR_ID} -m -d -t "${{ env.PR_TITLE }}" || echo "Empty PR ID. Ignored!"