Skip to content

Commit 8bb24b3

Browse files
committed
fix: 스크립트 실행 시점 수정
- assignee와 reviewer는 PR 이벤트에만 동작하도록 수정 - 오토 머지는 Approve 상태가 되었을 때만 동작하도록 수정
1 parent 095cafe commit 8bb24b3

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

.github/workflows/auto-assign-merge.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: Auto Assign, Review, and Merge
33
on:
44
pull_request:
55
types:
6-
[
7-
opened,
8-
labeled,
9-
unlabeled,
10-
review_requested,
11-
review_request_removed,
12-
]
6+
- opened
7+
- labeled
8+
- unlabeled
9+
- review_requested
10+
- review_request_removed
1311
pull_request_review:
14-
types: [submitted]
12+
types:
13+
- submitted
1514

1615
jobs:
1716
auto-assign:
17+
if: github.event_name == 'pull_request'
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout repository
@@ -37,6 +37,7 @@ jobs:
3737
});
3838
3939
auto-reviewers:
40+
if: github.event_name == 'pull_request'
4041
runs-on: ubuntu-latest
4142
needs: auto-assign
4243
steps:
@@ -88,9 +89,9 @@ jobs:
8889
}
8990
9091
auto-merge:
92+
if: github.event_name == 'pull_request_review' && github.event.action == 'submitted' && github.event.review.state == 'approved'
9193
runs-on: ubuntu-latest
9294
needs: [auto-assign, auto-reviewers]
93-
if: github.event.pull_request.merged == false
9495
steps:
9596
- name: Checkout repository
9697
uses: actions/checkout@v2
@@ -106,6 +107,17 @@ jobs:
106107
script: |
107108
const prNumber = context.payload.pull_request.number;
108109
110+
// Check if PR is already merged
111+
const pr = await github.rest.pulls.get({
112+
owner: context.repo.owner,
113+
repo: context.repo.repo,
114+
pull_number: prNumber
115+
});
116+
117+
if (pr.data.merged) {
118+
return;
119+
}
120+
109121
// Check if PR is approved
110122
const reviews = await github.rest.pulls.listReviews({
111123
owner: context.repo.owner,

0 commit comments

Comments
 (0)