Skip to content

chore: develop -> master ff-only 머지 자동화 액션 추가 #740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whqtker merged 3 commits into from
Jun 9, 2026
Merged

chore: develop -> master ff-only 머지 자동화 액션 추가 #740

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdd6101
chore: ff-merge 액션 레이블 기반 트리거로 교체
whqtker Jun 9, 2026
3bf3a6b
fix: context.workflow 대신 context.job 사용
whqtker Jun 9, 2026
8cb7062
feat: write 권한이 있는 사용자 여부 추가 검증
whqtker Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions .github/workflows/ff-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: FF-Only Merge to Master

on:
pull_request_review:
types: [submitted]
pull_request:
types: [labeled]
check_suite:
types: [completed]

jobs:
ff-merge:
if: |
github.event_name == 'pull_request_review' ||
(github.event_name == 'pull_request' && github.event.label.name == 'ready-to-merge') ||
(github.event_name == 'check_suite' && github.event.check_suite.conclusion == 'success')
Comment thread
whqtker marked this conversation as resolved.
runs-on: ubuntu-latest

Expand All @@ -21,16 +21,25 @@ jobs:
script: |
let prNumber, headSha;

if (context.eventName === 'pull_request_review') {
if (context.eventName === 'pull_request') {
const pr = context.payload.pull_request;
if (pr.base.ref !== 'master' || pr.head.ref !== 'develop' || pr.state !== 'open') {
core.setOutput('ready', 'false');
return;
}
if (context.payload.review.state !== 'approved') {

// 레이블을 부착한 주체의 저장소 권한 확인
const { data: perm } = await github.rest.repos.getCollaboratorPermissionLevel({
owner: context.repo.owner,
repo: context.repo.repo,
username: context.payload.sender.login,
});

if (!['admin', 'write'].includes(perm.permission)) {
core.setOutput('ready', 'false');
return;
}

prNumber = pr.number;
headSha = pr.head.sha;
} else {
Expand All @@ -56,25 +65,15 @@ jobs:
}
}

// 승인 상태 확인
const { data: reviews } = await github.rest.pulls.listReviews({
// ready-to-merge 레이블 확인
const { data: pr } = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});

const latest = {};
for (const r of reviews) {
if (r.state !== 'COMMENTED') {
latest[r.user.login] = r.state;
}
}

const values = Object.values(latest);
const approved = values.filter(s => s === 'APPROVED').length >= 1;
const blocked = values.some(s => s === 'CHANGES_REQUESTED');

if (!approved || blocked) {
const hasLabel = pr.labels.some(l => l.name === 'ready-to-merge');
if (!hasLabel) {
core.setOutput('ready', 'false');
return;
}
Expand All @@ -87,7 +86,7 @@ jobs:
per_page: 100,
});

const ciRuns = check_runs.filter(r => r.name !== context.workflow);
const ciRuns = check_runs.filter(r => r.name !== context.job);
const allPassed = ciRuns.length > 0 && ciRuns.every(r =>
r.status === 'completed' &&
['success', 'skipped', 'neutral'].includes(r.conclusion)
Expand Down Expand Up @@ -120,9 +119,9 @@ jobs:
APPROVED_SHA="${{ steps.validate.outputs.head_sha }}"
CURRENT_SHA=$(git rev-parse origin/develop)
if [ "$APPROVED_SHA" != "$CURRENT_SHA" ]; then
echo "develop이 승인 이후 변경되었습니다."
echo " 승인된 SHA: $APPROVED_SHA"
echo " 현재 SHA: $CURRENT_SHA"
echo "레이블 부착 이후 develop이 변경되었습니다."
echo " 레이블 시점 SHA: $APPROVED_SHA"
echo " 현재 SHA: $CURRENT_SHA"
exit 1
fi

Expand Down
Loading