Skip to content

Commit 09e4702

Browse files
authored
fix: 머지 방식을 squash로 바꾸고 실패 시 워크플로가 실패하도록 수정 (#2761)
1 parent fa6f7b6 commit 09e4702

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

.github/workflows/management.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ jobs:
125125
done
126126
fi
127127
128+
failed=$(echo "$response" | jq '[.results[]? | select(.skipped != true and .approved != true)] | length')
129+
if [ "$success" != "true" ] || [ "$failed" -gt 0 ]; then
130+
echo "::error::승인 실패 ${failed}건 (success=$success)"
131+
exit 1
132+
fi
133+
128134
merge-prs:
129135
name: Merge Open PRs 🚀
130136
runs-on: ubuntu-latest
@@ -149,7 +155,7 @@ jobs:
149155
150156
# Build request payload
151157
week_input="${{ inputs.week }}"
152-
merge_method="merge"
158+
merge_method="squash"
153159
154160
if [ -z "$week_input" ]; then
155161
payload="{\"repo_name\": \"${{ github.event.repository.name }}\", \"merge_method\": \"$merge_method\", \"excludes\": $excludes}"
@@ -231,3 +237,9 @@ jobs:
231237
fi
232238
done
233239
fi
240+
241+
failed=$(echo "$response" | jq '[.results[]? | select(.skipped != true and .merged != true)] | length')
242+
if [ "$success" != "true" ] || [ "$failed" -gt 0 ]; then
243+
echo "::error::머지 실패 ${failed}건 (success=$success)"
244+
exit 1
245+
fi

0 commit comments

Comments
 (0)