From 8431c6fc6cc72b40fdaac3503a3434dfbd88e2d1 Mon Sep 17 00:00:00 2001
From: Yuya KAMATAKI <kamataki@rumginger.org>
Date: Sun, 7 Sep 2025 17:38:41 +0900
Subject: [PATCH] fix workflow 4

---
 .gitea/workflows/deploy-pages.yaml | 32 ++++++++----------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/.gitea/workflows/deploy-pages.yaml b/.gitea/workflows/deploy-pages.yaml
index 4c827f4..90dbea1 100644
--- a/.gitea/workflows/deploy-pages.yaml
+++ b/.gitea/workflows/deploy-pages.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CF_PAGES_PROJECT: ${{ vars.CF_PAGES_PROJECT }} # 例: blog
-      PROD_BRANCH: "main" # Pages 側の本番ブランチ名
+      PROD_BRANCH: "main" # Pagesの本番ブランチ
       CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
       CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
       CI: "1"
@@ -31,7 +31,7 @@ jobs:
       - name: Build site with cobalt
         run: cobalt build # 既定出力: ./_site
 
-      - name: Compute BRANCH_NAME and COMMIT metadata
+      - name: Compute BRANCH_NAME and COMMIT meta
         id: meta
         shell: bash
         run: |
@@ -41,25 +41,9 @@ jobs:
           echo "COMMIT_SHA=$(git rev-parse HEAD)" >> "$GITHUB_ENV"
           echo "COMMIT_MSG=$(git log -1 --pretty=%s)" >> "$GITHUB_ENV"
 
-      - name: Ensure Pages project exists (create if missing)
-        shell: bash
-        run: |
-          set -euo pipefail
-          test -n "${CF_PAGES_PROJECT}"
-          code=$(curl -sS -o /dev/null -w '%{http_code}' \
-            -H "Authorization: Bearer ${CLOUDFLARE_API_TOKEN}" \
-            "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/pages/projects/${CF_PAGES_PROJECT}")
-          if [ "$code" != "200" ]; then
-            npx --yes wrangler@latest pages project create "${CF_PAGES_PROJECT}" --production-branch "${PROD_BRANCH}"
-          fi
-        # APIで存在確認 → なければ非対話で作成。:contentReference[oaicite:4]{index=4}
-
-      - name: Deploy to Cloudflare Pages
-        shell: bash
-        run: |
-          npx --yes wrangler@latest pages deploy "_site" \
-            --project-name "${CF_PAGES_PROJECT}" \
-            --branch "${BRANCH_NAME}" \
-            --commit-hash "${COMMIT_SHA}" \
-            --commit-message "${COMMIT_MSG}"
-        # 公式手順に準拠。ブランチ明示で本番/プレビューを制御。:contentReference[oaicite:5]{index=5}
+      - name: Deploy with wrangler-action
+        uses: https://github.com/cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy _site --project-name "${{ vars.CF_PAGES_PROJECT }}" --branch "${{ env.BRANCH_NAME }}"