From 2ff104f1733e96221d6cce27d89436c38f212f91 Mon Sep 17 00:00:00 2001
From: sbin <sbin@solbox.com>
Date: Tue, 9 Jun 2026 15:20:57 +0900
Subject: [PATCH] =?UTF-8?q?fix(ci):=20=EB=B9=8C=EB=93=9C=20=EA=B2=8C?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=EC=9D=98=20=EC=BD=98=ED=85=90=EC=B8=A0=20?=
 =?UTF-8?q?=EB=8F=99=EA=B8=B0=ED=99=94=EB=A5=BC=20=EC=99=84=EC=A0=84=20?=
 =?UTF-8?q?=EA=B5=90=EC=B2=B4=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20[skip-notion]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

merge-develop.yml과 pr-build.yml 빌드 게이트가
git checkout origin/main -- docs/ blog/ static/img/ 만 수행해,
develop 또는 PR 브랜치에만 있고 main에선 삭제·rename된 stale 파일이
작업트리에 남아 옛 frontmatter(예: 삭제된 author 키)로 빌드가 깨졌음.

rm -rf 후 git checkout으로 콘텐츠 디렉토리를 main 버전으로 완전 교체.
---
 .github/workflows/merge-develop.yml | 8 ++++++--
 .github/workflows/pr-build.yml      | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge-develop.yml b/.github/workflows/merge-develop.yml
index 777196b..bf7be54 100644
--- a/.github/workflows/merge-develop.yml
+++ b/.github/workflows/merge-develop.yml
@@ -48,9 +48,13 @@ jobs:
         if: steps.diff.outputs.has_changes == 'true'
         run: npm ci
 
-      - name: Checkout docs/ from main (빌드용 콘텐츠)
+      - name: Checkout docs/ from main (빌드용 콘텐츠 완전 교체)
         if: steps.diff.outputs.has_changes == 'true'
-        run: git checkout origin/main -- docs/ blog/ static/img/
+        # rm -rf 없이 git checkout만 하면 develop에만 있고 main엔 없는 파일이 그대로 남아,
+        # 옛 콘텐츠가 새 authors.yml·sidebar와 충돌해 빌드 게이트가 깨진다.
+        run: |
+          rm -rf docs blog static/img
+          git checkout origin/main -- docs blog static/img
 
       - name: Build gate
         if: steps.diff.outputs.has_changes == 'true'
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index fba684b..b5a21d3 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -26,10 +26,13 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Checkout docs/ from main (콘텐츠는 main에서 관리됨)
+      - name: Checkout docs/ from main (콘텐츠 완전 교체)
+        # rm -rf 없이 git checkout만 하면 PR 브랜치에만 있고 main엔 없는 파일이 그대로 남아,
+        # 옛 콘텐츠가 새 authors.yml·sidebar와 충돌해 빌드 게이트가 깨진다.
         run: |
           git fetch origin main
-          git checkout origin/main -- docs/ blog/ static/img/
+          rm -rf docs blog static/img
+          git checkout origin/main -- docs blog static/img
 
       - name: Setup Node.js
         uses: actions/setup-node@v4