Release v1.0.2-rc.0 (#19)

Author: ansidev

.github/workflows/release.yaml

@@ -59,19 +59,24 @@ jobs:
             --title "${{ env.RELEASE_TAG }}" \
             --generate-notes
 
-      - name: Create merge PR ${{ github.head_ref }} -> ${{ env.BRANCH_DEVELOP }}
+      - name: Create PR ${{ github.head_ref }} -> ${{ env.BRANCH_DEVELOP }} and merge automatically
         env:
           PR_TITLE: Merge branch '${{ github.head_ref }}' into ${{ env.BRANCH_DEVELOP }}
           PR_BODY: |
-            This PR merges the ${{ github.head_ref }} branch back into ${{ env.BRANCH_DEVELOP }} branch.
-            This happens to ensure that the updates that happened on the ${{ github.head_ref }} branch, i.e. CHANGELOG and manifest updates are also present on the ${{ env.BRANCH_DEVELOP }} branch.
+            This PR merges the branch `${{ github.head_ref }}` back into the branch `${{ env.BRANCH_DEVELOP }}`.
+
+            This ensures that the updates on the branch `${{ github.head_ref }}`, i.e. CHANGELOG and manifest updates, are also present on the branch `${{ env.BRANCH_DEVELOP }}`.
           PR_LABEL: automated-pr
         run: |
           gh label create ${{ env.PR_LABEL }} --force
+
           gh pr create \
             --base ${{ env.BRANCH_DEVELOP }} \
             --head ${{ github.head_ref }} \
             --title "${{ env.PR_TITLE }}" \
             --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!"

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.2-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.7...v1.0.2-rc.0) (2023-02-13)
+
+
+### Features
+
+* **workflow-release:** auto create merge commit for PR on merging ([bc07fe5](https://github.com/ansidev/sample-gitflow-release-workflows/commit/bc07fe522fc2dbc8ea4171be7404a8870f4dce38))
+* **workflow-release:** auto merge PR after creating ([85a272f](https://github.com/ansidev/sample-gitflow-release-workflows/commit/85a272f377da0589b55bbc9420d933237f41ff6e))
+
+
 ### [1.0.1-rc.7](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.6...v1.0.1-rc.7) (2023-02-13)
 
 

VERSION

@@ -1 +1 @@
-1.0.1-rc.7
+1.0.2-rc.0