Merge branch 'release/1.1.0-rc.1' into develop

.github/workflows/draft_release_hotfix_pr.yaml

@@ -69,17 +69,18 @@ jobs:
             Merging this PR will create the GitHub release ${{ env.TAG_PREFIX }}${{ env.RELEASE_VERSION }}.
         run: |
           PR_LABELS="automated-pr,${RELEASE_TYPE}-pr"
+
+          [[ ${PRE_RELEASE:false} == "true" ]] && ( gh label create 'pre-release' --force && PR_LABELS="$PR_LABELS,pre-release" )
+
           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_ID=$(gh pr list --state open --search "base:${{ env.BRANCH_MAIN }} head:${{ github.ref_name }}" | head -1 | cut -f1)
-          [[ ! -z "$PR_ID" ]] && \
+          [[ ! -z "$PR_ID" ]] && echo "PR was created with ID $PR_ID. Ignored!" || \
             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!"
+              --fill

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.1.0-rc.1](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.1.0-rc.0...v1.1.0-rc.1) (2023-02-14)
+
+### Features
+
+* **workflow-auto-merge-release-hotfix-into-develop:** add new workflow for auto merging release/hotfix into develop ([c9d2c41](https://github.com/ansidev/sample-gitflow-release-workflows/commit/c9d2c413e1c3e3aeb1d3c31c529b96f5c29e4bf5))
+
+### Bug Fixes
+
+* **workflow-draft-release-hotfix-pr:** correct wrong logic ([f36ddf1](https://github.com/ansidev/sample-gitflow-release-workflows/commit/f36ddf1e174e72b65b21efa41f623ce2371d0355))
+* **workflow-draft-release-hotfix-pr:** fix PR is missing label `pre-release` ([fe4d1e0](https://github.com/ansidev/sample-gitflow-release-workflows/commit/fe4d1e00b9d2517bbe0f89794ea2668bea5765fa))
+
+### Documentations
+
+* **readme:** update README.md ([bd62d5a](https://github.com/ansidev/sample-gitflow-release-workflows/commit/bd62d5abd674b76d452b3b1c151749ca572f3f79))
+
 ## [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
@@ -12,62 +27,62 @@ All notable changes to this project will be documented in this file. See [standa
 
 * **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)
+## [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)
+## [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)
+## [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)
+## [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)
+## [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)
+## [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)
+## [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)
+## [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)
+## [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))
 
-### [1.0.1-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.0-rc.1...v1.0.1-rc.0) (2023-02-12)
+## [1.0.1-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.0-rc.1...v1.0.1-rc.0) (2023-02-12)
 
 ### Features
 
@@ -77,7 +92,7 @@ All notable changes to this project will be documented in this file. See [standa
 
 * **github-actions:** rename repository secret variable GITHUB_TOKEN to GH_TOKEN ([5da410e](https://github.com/ansidev/sample-gitflow-release-workflows/commit/5da410ee04fe1151835df35f4795dab51d18aa18))
 
-### 1.0.0-rc.1 (2023-02-12)
+## 1.0.0-rc.1 (2023-02-12)
 
 ### Features
 

README.md

@@ -22,10 +22,11 @@ Sample Gitflow release workflow using GitHub Actions and official [GitHub CLI](h
 
 - Workflows
 
-  | Name                    | Description                    | File                                                                             |
-  | ----------------------- | ------------------------------ | -------------------------------------------------------------------------------- |
-  | Release                 | Automate releasing             | [release.yaml](./.github/workflows/release.yaml)                                 |
-  | Draft Release/Hotfix PR | Automate drafting a release PR | [draft_release_hotfix_pr.yaml](./.github/workflows/draft_release_hotfix_pr.yaml) |
+  | Name                                   | Description                                     | File                                                                                                           |
+  | -------------------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------- |
+  | Release                                | Automate releasing                              | [release.yaml](./.github/workflows/release.yaml)                                                               |
+  | Auto merge release/hotfix into develop | Automate merging release/hotfix PR into develop | [auto_merge_release_hotfix_into_develop.yaml](./.github/workflows/auto_merge_release_hotfix_into_develop.yaml) |
+  | Draft release/hotfix PR                | Automate drafting a release/hotfix PR           | [draft_release_hotfix_pr.yaml](./.github/workflows/draft_release_hotfix_pr.yaml)                               |
 
 - You have to update below env variables if necessary
 

VERSION

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