From 6db2a7a4b0c454ffb2ac7a1f93e4cab5c2928ea9 Mon Sep 17 00:00:00 2001
From: Seungwoo321 <seungwoo321@gmail.com>
Date: Mon, 12 May 2025 17:40:08 +0900
Subject: [PATCH 1/2] fix: workflows

---
 .github/workflows/create-release-pr.yml           | 4 ++--
 .github/workflows/release-lazy-table-renderer.yml | 4 ++--
 .github/workflows/release-vue-pivottable.yml      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
index d2d87eb..44777c9 100644
--- a/.github/workflows/create-release-pr.yml
+++ b/.github/workflows/create-release-pr.yml
@@ -31,8 +31,8 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ steps.generate-token.outputs.token }}
-          base: main
-          branch: release
+          base: release
+          branch: main
           title: 'chore: sync main to release'
           body: |
             이 PR은 메인 브랜치의 변경사항을 릴리즈 브랜치로 동기화합니다.
diff --git a/.github/workflows/release-lazy-table-renderer.yml b/.github/workflows/release-lazy-table-renderer.yml
index 8811efe..7530ddf 100644
--- a/.github/workflows/release-lazy-table-renderer.yml
+++ b/.github/workflows/release-lazy-table-renderer.yml
@@ -59,8 +59,8 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          branch: release
-          base: main
+          branch: main
+          base: release
           title: 'chore: update version to latest release'
           body: |
             This PR updates the main branch with the latest version information from the release branch.
diff --git a/.github/workflows/release-vue-pivottable.yml b/.github/workflows/release-vue-pivottable.yml
index 4c3a86e..368752f 100644
--- a/.github/workflows/release-vue-pivottable.yml
+++ b/.github/workflows/release-vue-pivottable.yml
@@ -55,8 +55,8 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          branch: release
-          base: main
+          branch: main
+          base: release
           title: 'chore: update version to latest release'
           body: |
             This PR updates the main branch with the latest version information from the release branch.

From bf9547ec10a6400e969ad1b38bded79af865c42e Mon Sep 17 00:00:00 2001
From: Seungwoo321 <seungwoo321@gmail.com>
Date: Tue, 13 May 2025 13:48:36 +0900
Subject: [PATCH 2/2] ci: update workflows

---
 .github/workflows/create-release-pr.yml      | 32 ++++++++------------
 .github/workflows/release-vue-pivottable.yml | 26 ++++++++++------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
index 44777c9..d930cf1 100644
--- a/.github/workflows/create-release-pr.yml
+++ b/.github/workflows/create-release-pr.yml
@@ -13,31 +13,23 @@ jobs:
       pull-requests: write
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: release
 
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: tibdex/github-app-token@v1
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-          installation_id: ${{ secrets.APP_INSTALLATION_ID }}
+      - name: Reset main branch
+        run: |
+          git fetch origin main:main
+          git reset --hard main
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
-          token: ${{ steps.generate-token.outputs.token }}
-          base: release
-          branch: main
+          branch: main-to-release
+          commit-message: 'chore: sync main to release'
           title: 'chore: sync main to release'
           body: |
-            이 PR은 메인 브랜치의 변경사항을 릴리즈 브랜치로 동기화합니다.
+            이 PR은 main 브랜치의 변경사항을 release 브랜치로 동기화합니다.
 
-            이 PR이 머지되면 릴리즈 워크플로우가 자동으로 트리거됩니다.
-          labels: |
-            automated-pr
-            sync-to-release
+            이 PR이 머지되면 release 워크플로우가 자동으로 트리거됩니다.
+          delete-branch: true
diff --git a/.github/workflows/release-vue-pivottable.yml b/.github/workflows/release-vue-pivottable.yml
index 368752f..9c31e1f 100644
--- a/.github/workflows/release-vue-pivottable.yml
+++ b/.github/workflows/release-vue-pivottable.yml
@@ -15,7 +15,7 @@ jobs:
       id-token: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -50,18 +50,26 @@ jobs:
         run: |
           pnpm dlx semantic-release
 
-      - name: Create Pull Request to main
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+
+      - name: Reset main branch
+        run: |
+          git fetch origin release:release
+          git reset --hard release
+      - name: Create Pull Request
         if: success()
         uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: main
-          base: release
+          branch: release-to-main
+          commit-message: 'chore: update version to latest release'
           title: 'chore: update version to latest release'
           body: |
-            This PR updates the main branch with the latest version information from the release branch.
+            이 PR은 release 브랜치의 최신 버전 정보로 main 브랜치를 업데이트합니다.
 
-            - Updates package.json version
-            - Updates CHANGELOG.md
+            - package.json 버전 업데이트
+            - CHANGELOG.md 업데이트
 
-            This PR was automatically created by the release workflow.
+            이 PR은 release 워크플로우에 의해 자동으로 생성되었습니다.
+          delete-branch: true