Skip to content

Commit cf010c1

Browse files
authored
feat: Enable automerging of branches (#920)
* feat Enable automerging of branches * feat limit when this script runs * feat Fix indention
1 parent 0488b70 commit cf010c1

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

.github/workflows/automerge.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: automerge
2+
on:
3+
pull_request:
4+
types: [labeled, unlabeled, synchronize, edited, unlocked]
5+
pull_request_review:
6+
types: [submitted]
7+
check_suite:
8+
types: [completed]
9+
status: success
10+
jobs:
11+
automerge:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: automerge
15+
uses: "pascalgn/automerge-action@4536e8847eb62fe2f0ee52c8fa92d17aa97f932f"
16+
env:
17+
GITHUB_TOKEN: "${{ secrets.ACTIONS }}"
18+
MERGE_LABELS: "Ready to merge,!work in progress!,!blocked,!Needs: code updates,!Needs: additional info,!Needs: AT updates,!Needs: changelog,!Ready: branch testing,!Ready: browser testing"
19+
MERGE_REMOVE_LABELS: Ready to merge
20+
MERGE_METHOD: squash
21+
MERGE_COMMIT_MESSAGE: "pull-request-title"
22+
MERGE_RETRIES: 3
23+
MERGE_RETRY_SLEEP: 10000
24+
UPDATE_LABELS: "Ready to merge,!work in progress!,!blocked"
25+
UPDATE_METHOD: rebase

CHANGELOG-prerelease.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
- [775b821](https://github.com/patternfly/patternfly-elements/commit/775b821702c903f926b8bf9fdf9c948ac949335f) feat: Add automatic labeling to PRs
44
- [82bf8e6](https://github.com/patternfly/patternfly-elements/commit/82bf8e6a0d407a651571dac1e37d06a2b14fa3d4) feat: Move PR cards automatically in the Project when labels are changed
5+
- [235e9a8](https://github.com/patternfly/patternfly-elements/commit/235e9a816b763dc9251e3022c914cba72f148368) fix: Move tab headings to the ShadowDOM
56
- [2adef08](https://github.com/patternfly/patternfly-elements/commit/2adef088768ac52f813899d42ba5a45119761ea3) fix: Add watch task to components generated before infra change
67
- [235e9a8](https://github.com/patternfly/patternfly-elements/commit/235e9a816b763dc9251e3022c914cba72f148368) fix: Move tab headings to the ShadowDOM
7-
- [](https://github.com/patternfly/patternfly-elements/commit/) feat: pfe-icon and pfe-icon-panel updates
8+
- [6919a2c](https://github.com/patternfly/patternfly-elements/commit/6919a2c9283551d9e25d60ff96d497fab016e270) feat: pfe-icon and pfe-icon-panel updates
89
- Update paths to built-in sets: (#723)
910
- Storybook icon listing: (#728)
1011
- Icon panel storybook: (#719)
11-
12+
- [](https://github.com/patternfly/patternfly-elements/commit/) feat: Automerging PRs based on labels
1213

1314
## Prerelease 49 ( 2020-05-29 )
1415

0 commit comments

Comments
 (0)