Skip to content

Commit bce4c2b

Browse files
authored
chore: Update automerge & needs/ready labels (#1341)
1 parent 30c77d0 commit bce4c2b

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Default template
33
about: Generic template
4-
labels: "feature, needs: AT updates, needs: changelog, needs: branch testing, priority: low"
4+
labels: "feature, needs: AT updates, needs: changelog, ready: branch testing, priority: low"
55
---
66

77
## Component name

.github/PULL_REQUEST_TEMPLATE/new_component.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Labels: feature, needs: branch testing, needs: browser testing, needs: code review, priority: low -->
1+
<!-- Labels: feature, ready: branch testing, ready: browser testing, needs: code review, priority: low -->
22

33
<!-- Thank you for submitting a pull request! -->
44
## New component: <component-name>

.github/PULL_REQUEST_TEMPLATE/update_component.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Labels: feature, needs: branch testing, needs: browser testing, needs: code review, priority: low -->
1+
<!-- Labels: feature, ready: branch testing, ready: browser testing, needs: code review, priority: low -->
22

33
<!-- Thank you for submitting a pull request! -->
44
## Component updates: <component-name>

.github/PULL_REQUEST_TEMPLATE/update_infrastructure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Labels: tools, needs: branch testing, needs: code review, priority: low -->
1+
<!-- Labels: tools, ready: branch testing, needs: code review, priority: low -->
22

33
<!-- Thank you for submitting a pull request! -->
44
## Infrastructure updates

.github/workflows/automerge.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on:
66
pull_request_review:
77
types:
88
- submitted
9-
workflow_run:
10-
workflows: ["Build & test"]
11-
types:
12-
- completed
139

1410
jobs:
1511
try_to_merge:
@@ -20,7 +16,7 @@ jobs:
2016
uses: pascalgn/[email protected]
2117
env:
2218
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
23-
MERGE_LABELS: "!work in progress!,!on hold,!blocked,!needs: code updates,!needs: additional info,!needs: AT updates,!needs: changelog,!ready: branch testing,!ready: browser testing"
19+
MERGE_LABELS: "!work in progress!,!on hold,!blocked,!needs: code updates,!needs: additional info,!needs: AT updates,!needs: changelog,!ready: code review,!ready: design review,!ready: branch testing,!ready: browser testing"
2420
MERGE_REMOVE_LABELS: "ready to merge"
2521
MERGE_METHOD: squash
2622
MERGE_COMMIT_MESSAGE: "pull-request-title"

.github/workflows/project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
- name: Move to testing
4141
uses: takanabe/[email protected]
4242
if: |
43-
contains(github.event.*.labels.*.name, 'needs: browser testing') ||
44-
contains(github.event.*.labels.*.name, 'needs: branch testing')
43+
contains(github.event.*.labels.*.name, 'ready: browser testing') ||
44+
contains(github.event.*.labels.*.name, 'ready: branch testing')
4545
env:
4646
GITHUB_PROJECT_COLUMN_NAME: Testing
4747
- name: Ready to merge

0 commit comments

Comments
 (0)