Merge branch 'release/1.0.2' into develop

.github/workflows/release.yaml

@@ -63,9 +63,9 @@ jobs:
         env:
           PR_TITLE: Merge branch '${{ github.head_ref }}' into ${{ env.BRANCH_DEVELOP }}
           PR_BODY: |
-            This PR merges the branch `${{ github.head_ref }}` back into the branch `${{ env.BRANCH_DEVELOP }}`.
+            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 }}`.
+            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

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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)
+
+
+### 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)
 
 
@@ -60,7 +67,7 @@ All notable changes to this project will be documented in this file. See [standa
 
 * **github-actions:** correct syntax ([dcea1b6](https://github.com/ansidev/sample-gitflow-release-workflows/commit/dcea1b6fde978a05ca3ff8855af26600e7a9f226))
 
-### 1.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
 

README.md

@@ -1,11 +1,35 @@
 # sample-gitflow-release-workflows
 
-Sample Gitflow release workflow using GitHub Actions.
+[![Release](https://img.shields.io/github/release/ansidev/sample-gitflow-release-workflows.svg)](https://github.com/ansidev/sample-gitflow-release-workflows/releases)
+[![Build Status](https://github.com/ansidev/sample-gitflow-release-workflows/workflows/release/badge.svg)](https://github.com/ansidev/sample-gitflow-release-workflows/actions)
+
+Sample Gitflow release workflow using GitHub Actions and official [GitHub CLI](https://cli.github.com/manual/).
+
+## Features
+
+- Auto create and publish a new release on merging changes from `release/**`/`hotfix/**` into `main`.
+- Auto create corresponding git tag with the released version.
+- Auto create PR and merge changes from `release/**`/`hotfix/**` back into `develop`.
 
 ## Manual
 
-- Workflow definitions: [release.yaml](./.github/workflows/release.yaml)
-- You have to update two env variables: `BRANCH_MAIN`, `BRANCH_DEVELOP` if necessary.
+- Workflows
+
+  | Name    | Description        | File                                             |
+  | ------- | ------------------ | ------------------------------------------------ |
+  | Release | Automate releasing | [release.yaml](./.github/workflows/release.yaml) |
+
+- You have to update below env variables if necessary
+
+  | Environment variable | Description            | Default value |
+  | -------------------- | ---------------------- | ------------- |
+  | BRANCH_MAIN          | The main branch        | `main`        |
+  | BRANCH_DEVELOP       | The develop branch     | `develop`     |
+  | TAG_PREFIX           | The prefix for git tag | `v`           |
+
+## Contact
+
+Le Minh Tri [@ansidev](https://ansidev.xyz/about).
 
 ## License
 

VERSION

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