Skip to content

Commit 854d3ac

Browse files
update chagelog
1 parent 1d21244 commit 854d3ac

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## v1.4.0
2+
3+
- Support Github Enterprise [#15](https://github.com/devmasx/merge-branch/pull/15)
4+
- Bump addressable from 2.7.0 to 2.8.0 [#14](https://github.com/devmasx/merge-branch/pull/14)
5+
16
## v1.3.1
27

38
- Fix, check inputs with empty string values.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
- uses: actions/checkout@master
2020

2121
- name: Merge development -> staging
22-
uses: devmasx/merge-branch@v1.3.1
22+
uses: devmasx/merge-branch@v1.4.0
2323
with:
2424
type: now
2525
from_branch: development
2626
target_branch: staging
2727
github_token: ${{ github.token }}
2828

2929
- name: Merge staging -> uat
30-
uses: devmasx/merge-branch@v1.3.1
30+
uses: devmasx/merge-branch@v1.4.0
3131
with:
3232
type: now
3333
from_branch: staging
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@master
5151

5252
- name: Merge staging -> uat
53-
uses: devmasx/merge-branch@v1.3.1
53+
uses: devmasx/merge-branch@v1.4.0
5454
with:
5555
type: now
5656
target_branch: uat
@@ -78,7 +78,7 @@ jobs:
7878
- uses: actions/checkout@master
7979

8080
- name: Merge by labeled
81-
uses: devmasx/merge-branch@v1.3.1
81+
uses: devmasx/merge-branch@v1.4.0
8282
with:
8383
label_name: 'merged in develop'
8484
target_branch: 'develop'

0 commit comments

Comments
 (0)