Skip to content

Commit 7f9f953

Browse files
authored
Merge branch 'hotfix/1.0.1-rc.7' into develop (#17)
2 parents 798a3fe + 646498b commit 7f9f953

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.github/workflows/release.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
with:
3333
ref: ${{ github.head_ref }}
3434
token: ${{ env.GH_TOKEN }}
35+
# needed by "gh pr create"
36+
fetch-depth: 0
3537

3638
- name: Extract version from release branch
3739
if: startsWith(github.head_ref, 'release/')
@@ -68,7 +70,7 @@ jobs:
6870
gh label create ${{ env.PR_LABEL }} --force
6971
gh pr create \
7072
--base ${{ env.BRANCH_DEVELOP }} \
71-
--head ${{ github.event.pull_request.merge_commit_sha }} \
73+
--head ${{ github.head_ref }} \
7274
--title "${{ env.PR_TITLE }}" \
7375
--body "${{ env.PR_BODY }}" \
7476
--label "${{ env.PR_LABEL }}" \

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
### [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)
6+
7+
8+
### Bug Fixes
9+
10+
* **github-actions:** fix failed command gh pr create ([c57d773](https://github.com/ansidev/sample-gitflow-release-workflows/commit/c57d773547c355bbff010a12d602f4abb0cb985d))
11+
512
### [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)
613

714

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.1-rc.6
1+
1.0.1-rc.7

0 commit comments

Comments
 (0)