Merge branch 'release/1.1.0-rc.0' into develop (#25)

Author: ansidev

.github/workflows/draft_release_hotfix_pr.yaml

@@ -13,12 +13,12 @@ env:
 
 jobs:
   create_draft_pr:
-    name: Create a draft PR for release/hotfix
+    name: Create draft PR
     runs-on: ubuntu-latest
     permissions:
       contents: write
     # only create draft pull requests on pushing to branches 'release/' or 'hotfix/'
-    if: (startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'hotfix/'))
+    if: (startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/'))
 
     steps:
       - name: Set GitHub token
@@ -28,23 +28,23 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.head_ref }}
+          ref: ${{ github.ref_name }}
           token: ${{ env.GH_TOKEN }}
           # needed by "gh pr create"
           fetch-depth: 0
 
       - name: Set environment variables for publishing release
-        if: startsWith(github.head_ref, 'release/')
+        if: startsWith(github.ref_name, 'release/')
         run: |
-          BRANCH_NAME="${{ github.head_ref }}"
+          BRANCH_NAME="${{ github.ref_name }}"
           VERSION=${BRANCH_NAME#release/}
           echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
           echo "RELEASE_TYPE=release" >> $GITHUB_ENV
 
       - name: Set environment variables for publishing hotfix
-        if: startsWith(github.head_ref, 'hotfix/')
+        if: startsWith(github.ref_name, 'hotfix/')
         run: |
-          BRANCH_NAME="${{ github.head_ref }}"
+          BRANCH_NAME="${{ github.ref_name }}"
           VERSION=${BRANCH_NAME#hotfix/}
           echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
           echo "RELEASE_TYPE=hotfix" >> $GITHUB_ENV
@@ -63,19 +63,23 @@ jobs:
 
       - name: Create PR '${{ env.PR_TITLE }}'
         env:
-          PR_LABELS: "automated-pr,${{ env.RELEASE_TYPE}}-pr"
+          PR_BODY: |
+            This PR was created to prepare for releasing ${{ env.TAG_PREFIX }}${{ env.RELEASE_VERSION }}.
+
+            Merging this PR will create the GitHub release ${{ env.TAG_PREFIX }}${{ env.RELEASE_VERSION }}.
         run: |
-          LABELS=${{ env.PR_LABELS }}
-          for LABEL in $(echo $LABELS | sed "s/,/ /g"); do gh label create $LABEL --force; done
+          PR_LABELS="automated-pr,${RELEASE_TYPE}-pr"
+          for LABEL in $(echo $PR_LABELS | sed "s/,/ /g"); do gh label create $LABEL --force; done
           [[ ${PRE_RELEASE:false} == "true" ]] && gh label create 'pre-release' --force
 
-          PR_BODY=$(git log ${{ env.BRANCH_MAIN }}..${{ github.head_ref }} --pretty=format:%s)
-
-          gh pr create \
-            --draft \
-            --base ${{ env.BRANCH_MAIN }} \
-            --head ${{ github.head_ref }} \
-            --title "${{ env.PR_TITLE }}" \
-            --body "$PR_BODY" \
-            --label "${{ env.PR_LABELS }}" \
-            --fill
+          PR_ID=$(gh pr list --state open --search "base:${{ env.BRANCH_MAIN }} head:${{ github.ref_name }}" | head -1 | cut -f1)
+          [[ ! -z "$PR_ID" ]] && \
+            gh pr create \
+              --draft \
+              --base "${{ env.BRANCH_MAIN }}" \
+              --head "${{ github.ref_name }}" \
+              --title "${{ env.PR_TITLE }}" \
+              --body "${{ env.PR_BODY }}" \
+              --label "${PR_LABELS}" \
+              --fill \
+          || echo "PR was created. Ignored!"

CHANGELOG.md

@@ -2,67 +2,67 @@
 
 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](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.2-rc.0...v1.0.2) (2023-02-13)
+## [1.1.0-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.2...v1.1.0-rc.0) (2023-02-13)
+
+### Features
+
+* **workflow-draft-release-hotfix-pr:** add new workflow for auto creating draft pr on pushing release or hotfix branch ([c539237](https://github.com/ansidev/sample-gitflow-release-workflows/commit/c53923703db4aaa1289092fe76482f98a10e6bea))
 
+### Documentations
+
+* **readme:** update README.md ([9175012](https://github.com/ansidev/sample-gitflow-release-workflows/commit/9175012bed48f47fc08e681983ad21f81e8e2f04))
+
+### [1.0.2](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.2-rc.0...v1.0.2) (2023-02-13)
 
 ### Bug Fixes
 
 * **github-actions:** fix PR body ([4701d3a](https://github.com/ansidev/sample-gitflow-release-workflows/commit/4701d3a33ea1f9563662ac0ddeb47ceb972e66d6))
 
 ### [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)
 
-
 ### Bug Fixes
 
 * **github-actions:** fix failed command gh pr create ([c57d773](https://github.com/ansidev/sample-gitflow-release-workflows/commit/c57d773547c355bbff010a12d602f4abb0cb985d))
 
 ### [1.0.1-rc.6](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.5...v1.0.1-rc.6) (2023-02-13)
 
-
 ### Bug Fixes
 
 * **github-actions:** correct command flag value ([95af6a2](https://github.com/ansidev/sample-gitflow-release-workflows/commit/95af6a2f92adb1f3a6709c9225b3028aedbc5987))
 
 ### [1.0.1-rc.5](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.4...v1.0.1-rc.5) (2023-02-13)
 
-
 ### Bug Fixes
 
 * **github-actions:** revert wrong changes ([1e044df](https://github.com/ansidev/sample-gitflow-release-workflows/commit/1e044dfd9746afbe7263c484813a8a26920119bf))
 
 ### [1.0.1-rc.4](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.3...v1.0.1-rc.4) (2023-02-12)
 
-
 ### Bug Fixes
 
 * **github-actions:** fix fail steps and refactor code ([872d740](https://github.com/ansidev/sample-gitflow-release-workflows/commit/872d740b98dd15adc988079744656814229f37d5))
 
 ### [1.0.1-rc.3](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.2...v1.0.1-rc.3) (2023-02-12)
 
-
 ### Bug Fixes
 
 * **github-actions:** remove invalid command flag ([1794f4c](https://github.com/ansidev/sample-gitflow-release-workflows/commit/1794f4cc27e9053e6ddbbccd01d7d0895812d510))
 
 ### [1.0.1-rc.2](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.1...v1.0.1-rc.2) (2023-02-12)
 
-
 ### Bug Fixes
 
 * **github-actions:** add missing checkout step ([e20f63a](https://github.com/ansidev/sample-gitflow-release-workflows/commit/e20f63ababd316d413b9573c727c68717b3b480d))
 
 ### [1.0.1-rc.1](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.0...v1.0.1-rc.1) (2023-02-12)
 
-
 ### Bug Fixes
 
 * **github-actions:** correct syntax ([dcea1b6](https://github.com/ansidev/sample-gitflow-release-workflows/commit/dcea1b6fde978a05ca3ff8855af26600e7a9f226))

VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0-rc.0