Skip to content

Commit a65c312

Browse files
authored
Hotfix v1.0.1-rc.5 (#12)
2 parents be25d4b + 8b9d449 commit a65c312

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

.github/workflows/release.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ on:
1010
env:
1111
BRANCH_MAIN: main
1212
BRANCH_DEVELOP: develop
13-
BRANCH_RELEASE_PREFIX: release
14-
BRANCH_HOTFIX_PREFIX: hotfix
1513
TAG_PREFIX: v
1614

1715
jobs:
@@ -22,7 +20,7 @@ jobs:
2220
contents: write
2321
# only merge pull requests that begin with 'release/' or 'hotfix/'
2422
if: github.event.pull_request.merged == true &&
25-
(startsWith(github.head_ref, '${{ env.BRANCH_RELEASE_PREFIX }}/') || startsWith(github.head_ref, '${{ env.BRANCH_HOTFIX_PREFIX }}/'))
23+
(startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'hotfix/'))
2624

2725
steps:
2826
- name: Set GitHub token
@@ -36,17 +34,17 @@ jobs:
3634
token: ${{ env.GH_TOKEN }}
3735

3836
- name: Extract version from release branch
39-
if: startsWith(github.head_ref, '${{ env.BRANCH_RELEASE_PREFIX }}/')
37+
if: startsWith(github.head_ref, 'release/')
4038
run: |
4139
BRANCH_NAME="${{ github.head_ref }}"
42-
VERSION=${BRANCH_NAME#${{ env.BRANCH_RELEASE_PREFIX }}/}
40+
VERSION=${BRANCH_NAME#release/}
4341
echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
4442
4543
- name: Extract version from hotfix branch
46-
if: startsWith(github.head_ref, '${{ env.BRANCH_HOTFIX_PREFIX }}/')
44+
if: startsWith(github.head_ref, 'hotfix/')
4745
run: |
4846
BRANCH_NAME="${{ github.head_ref }}"
49-
VERSION=${BRANCH_NAME#${{ env.BRANCH_HOTFIX_PREFIX }}/}
47+
VERSION=${BRANCH_NAME#hotfix/}
5048
echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
5149
5250
- name: Create release

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.5](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.4...v1.0.1-rc.5) (2023-02-13)
6+
7+
8+
### Bug Fixes
9+
10+
* **github-actions:** revert wrong changes ([1e044df](https://github.com/ansidev/sample-gitflow-release-workflows/commit/1e044dfd9746afbe7263c484813a8a26920119bf))
11+
512
### [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)
613

714

VERSION

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

0 commit comments

Comments
 (0)