From 74dd2464bffc888d1ba74cc0ab4325fc1b64ca29 Mon Sep 17 00:00:00 2001
From: taiyme <53635909+taiyme@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:41:52 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=82=AF=E3=83=95=E3=83=AD=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?Merge=20PR=E3=81=8C=E3=82=B3=E3=82=B1=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a079d95a4a40..b8e92e93d804 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -167,8 +167,9 @@ jobs:
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add .
           git commit -m "Release: ${{ needs.parse_new_version.outputs.NEW_VERSION }}"
-          git tag "${{ needs.parse_new_version.outputs.NEW_VERSION }}"
-          git push origin HEAD --follow-tags
+          git tag ${{ needs.parse_new_version.outputs.NEW_VERSION }}
+          git push origin HEAD
+          git push origin ${{ needs.parse_new_version.outputs.NEW_VERSION }}
 
   publish_docker_image:
     name: Publish Docker image
@@ -194,6 +195,12 @@ jobs:
       pull-requests: write
       contents: write
     steps:
+      - name: Checkout ${{ env.develop_branch }} branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.develop_branch }}
+          fetch-depth: 1
+
       - name: Merge PR
         run: |
           gh pr ready ${{ needs.create_pr.outputs.PR_NUMBER }}
@@ -218,4 +225,4 @@ jobs:
 
       - name: Release
         run: |
-          gh release create "${{ needs.parse_new_version.outputs.NEW_VERSION }}" --generate-notes
+          gh release create ${{ needs.parse_new_version.outputs.NEW_VERSION }} --generate-notes