From c8f1f78901160ac71e8df0c41078c3e1e5ffd738 Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 21:45:48 +0900 Subject: [PATCH] =?UTF-8?q?base=20branch=E3=81=A7=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=9FCI=E3=82=82=E8=A6=8B=E3=81=A6=E3=81=BB?= =?UTF-8?q?=E3=81=97=E3=81=84=E3=81=AE=E3=81=A7=E3=80=81=E4=B8=80=E6=97=A6?= =?UTF-8?q?=E5=85=88=E3=81=ABmerge=E3=81=97=E3=81=9F=E3=82=82=E3=81=AE?= =?UTF-8?q?=E3=82=92push=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge-queue-trigger-handler.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/merge-queue-trigger-handler.yml b/.github/workflows/merge-queue-trigger-handler.yml index 6040371..b2a92cd 100644 --- a/.github/workflows/merge-queue-trigger-handler.yml +++ b/.github/workflows/merge-queue-trigger-handler.yml @@ -14,11 +14,15 @@ jobs: actions: write steps: - uses: yamachu/merge-queue-action/precheck@main + id: precheck - uses: actions/checkout@v4 with: fetch-depth: 0 + ref: ${{ steps.precheck.outputs.base-branch }} - run: | git log --oneline + gh pr checkout ${{ github.event.issue.number }} + git merge ${{ steps.precheck.outputs.base-branch }} git push origin HEAD:auto.${{ github.event.issue.number }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}