Skip to content

Commit e80b383

Browse files
committed
chore: bump version number to 1.2.0
1 parent c35e2a9 commit e80b383

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: merge pull request
11-
uses: sudo-bot/action-pull-request-merge@v1.1.1
11+
uses: sudo-bot/action-pull-request-merge@v1.2.0
1212
with:
1313
github-token: ${{ secrets.GITHUB_TOKEN }}
1414
number: ${{ github.event.pull_request.number }}

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [v1.2.0] - 2022-07-10
10+
11+
- Upgrade @actions/core from 1.2.6 to 1.9.0
12+
- Upgrade @actions/github from 3.0.0 to 5.0.3
13+
- Bump node-fetch from 2.6.0 to 2.6.7
14+
- Upgrade from node 12 to node 16
15+
916
## [v1.1.1] - 2020-06-03
1017

1118
- Fix label matching rules
@@ -36,7 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3643

3744
- First stable version
3845

39-
[Unreleased]: https://github.com/sudo-bot/action-pull-request-merge/compare/v1.1.1...HEAD
46+
[Unreleased]: https://github.com/sudo-bot/action-pull-request-merge/compare/v1.2.0...HEAD
47+
[v1.2.0]: https://github.com/sudo-bot/action-pull-request-merge/compare/v1.1.1...v1.2.0
4048
[v1.1.1]: https://github.com/sudo-bot/action-pull-request-merge/compare/v1.1.0...v1.1.1
4149
[v1.1.0]: https://github.com/sudo-bot/action-pull-request-merge/compare/v1.0.3...v1.1.0
4250
[v1.0.3]: https://github.com/sudo-bot/action-pull-request-merge/compare/v1.0.2...v1.0.3

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ Marketplace: https://github.com/marketplace/actions/pull-request-merge
99
```yml
1010
steps:
1111
- name: merge a pull request
12-
uses: sudo-bot/action-pull-request-merge@v1.1.1
12+
uses: sudo-bot/action-pull-request-merge@v1.2.0
1313
with:
1414
github-token: ${{ secrets.GITHUB_TOKEN }}
1515
number: ${{ github.event.pull_request.number }}
1616
allowed-usernames-regex: ^williamdes$
1717
filter-label: merge-it
1818

1919
- name: merge a pull request without any need of a label (automatic merge)
20-
uses: sudo-bot/action-pull-request-merge@v1.1.1
20+
uses: sudo-bot/action-pull-request-merge@v1.2.0
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
number: ${{ github.event.pull_request.number }}
2424
allowed-usernames-regex: ^williamdes$
2525

2626
- name: merge a pull request with message and body (optional)
27-
uses: sudo-bot/action-pull-request-merge@v1.1.1
27+
uses: sudo-bot/action-pull-request-merge@v1.2.0
2828
with:
2929
github-token: ${{ secrets.GITHUB_TOKEN }}
3030
number: ${{ github.event.pull_request.number }}
@@ -35,7 +35,7 @@ steps:
3535
merge-message: "Merge #${{ github.event.pull_request.number }}"
3636

3737
- name: merge a pull request using fast-forward
38-
uses: sudo-bot/action-pull-request-merge@v1.1.1
38+
uses: sudo-bot/action-pull-request-merge@v1.2.0
3939
with:
4040
github-token: ${{ secrets.GITHUB_TOKEN }}
4141
number: ${{ github.event.pull_request.number }}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "action-pull-request-merge",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"description": "Merge a pull-request",
55
"main": "index.js",
66
"repository": {

0 commit comments

Comments
 (0)