diff --git a/.github/workflows/match.yml b/.github/workflows/match.yml index 102d181..1767da8 100644 --- a/.github/workflows/match.yml +++ b/.github/workflows/match.yml @@ -44,7 +44,7 @@ jobs: - name: Format generated files run: bun run format - - name: Create Pull Request + - name: Create and merge Pull Request env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | @@ -56,4 +56,7 @@ jobs: git diff --staged --quiet && exit 0 git commit -m "chore: update match history" git push -u origin "$BRANCH_NAME" - gh pr create --fill --body "자동 생성된 커피챗 매칭 히스토리 업데이트입니다." + PR_URL=$(gh pr create --fill --body "자동 생성된 커피챗 매칭 히스토리 업데이트입니다.") + # 다음 매칭 cron 전에 history가 main에 반영되도록 즉시 머지한다. + # 머지가 지연되면 stale history로 인해 재매칭/동일매칭이 발생한다. + gh pr merge "$PR_URL" --squash --delete-branch diff --git a/data/coffee-ui/history.json b/data/coffee-ui/history.json index 32b914e..adf7a70 100644 --- a/data/coffee-ui/history.json +++ b/data/coffee-ui/history.json @@ -74,14 +74,6 @@ ["299178466996256778", "701107097659506699"], ["913798074957172777", "960173224937812099"] ] - }, - { - "date": "2026-06-29", - "pairs": [ - ["267646459187298305", "1065143836562698291", "840925933538902016"], - ["960173224937812099", "913798074957172777"], - ["299178466996256778", "701107097659506699"] - ] } ] } diff --git a/data/coffee/history.json b/data/coffee/history.json index 44eafc6..264309b 100644 --- a/data/coffee/history.json +++ b/data/coffee/history.json @@ -178,13 +178,6 @@ ], ["1351517352356876342", "710532131171860510", "857282069994799105"] ] - }, - { - "date": "2026-06-29", - "pairs": [ - ["710532131171860510", "748456575655739432", "267646459187298305"], - ["432043985335222284", "1351517352356876342", "857282069994799105"] - ] } ] }