From feeb81ed1fdfefd48e646fb6d04328585db09f06 Mon Sep 17 00:00:00 2001
From: mtvpls <mtvpls@redaaa.ip-ddns.com>
Date: Fri, 23 Jan 2026 23:57:28 +0800
Subject: [PATCH] fix var set

---
 .github/workflows/cloudflare-deploy.yml | 105 +++++++++++-------------
 1 file changed, 50 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/cloudflare-deploy.yml b/.github/workflows/cloudflare-deploy.yml
index e504171..1b43c6d 100644
--- a/.github/workflows/cloudflare-deploy.yml
+++ b/.github/workflows/cloudflare-deploy.yml
@@ -53,61 +53,6 @@ jobs:
           NEXT_PUBLIC_ENABLE_OFFLINE_DOWNLOAD: ${{ secrets.NEXT_PUBLIC_ENABLE_OFFLINE_DOWNLOAD }}
           NEXT_PUBLIC_ENABLE_SOURCE_SEARCH: ${{ secrets.NEXT_PUBLIC_ENABLE_SOURCE_SEARCH }}
 
-      - name: Set Cloudflare environment variables
-        run: |
-          # 设置运行时环境变量到 Cloudflare
-          if [ -n "${{ secrets.USERNAME }}" ]; then
-            echo "${{ secrets.USERNAME }}" | npx wrangler secret put USERNAME
-          fi
-          if [ -n "${{ secrets.PASSWORD }}" ]; then
-            echo "${{ secrets.PASSWORD }}" | npx wrangler secret put PASSWORD
-          fi
-          if [ -n "${{ secrets.UPSTASH_URL }}" ]; then
-            echo "${{ secrets.UPSTASH_URL }}" | npx wrangler secret put UPSTASH_URL
-          fi
-          if [ -n "${{ secrets.UPSTASH_TOKEN }}" ]; then
-            echo "${{ secrets.UPSTASH_TOKEN }}" | npx wrangler secret put UPSTASH_TOKEN
-          fi
-          if [ -n "${{ secrets.TMDB_API_KEY }}" ]; then
-            echo "${{ secrets.TMDB_API_KEY }}" | npx wrangler secret put TMDB_API_KEY
-          fi
-          if [ -n "${{ secrets.TMDB_PROXY }}" ]; then
-            echo "${{ secrets.TMDB_PROXY }}" | npx wrangler secret put TMDB_PROXY
-          fi
-          if [ -n "${{ secrets.TMDB_REVERSE_PROXY }}" ]; then
-            echo "${{ secrets.TMDB_REVERSE_PROXY }}" | npx wrangler secret put TMDB_REVERSE_PROXY
-          fi
-          if [ -n "${{ secrets.DANMAKU_API_BASE }}" ]; then
-            echo "${{ secrets.DANMAKU_API_BASE }}" | npx wrangler secret put DANMAKU_API_BASE
-          fi
-          if [ -n "${{ secrets.DANMAKU_API_TOKEN }}" ]; then
-            echo "${{ secrets.DANMAKU_API_TOKEN }}" | npx wrangler secret put DANMAKU_API_TOKEN
-          fi
-          if [ -n "${{ secrets.ANNOUNCEMENT }}" ]; then
-            echo "${{ secrets.ANNOUNCEMENT }}" | npx wrangler secret put ANNOUNCEMENT
-          fi
-          if [ -n "${{ secrets.CRON_PASSWORD }}" ]; then
-            echo "${{ secrets.CRON_PASSWORD }}" | npx wrangler secret put CRON_PASSWORD
-          fi
-          if [ -n "${{ secrets.SITE_BASE }}" ]; then
-            echo "${{ secrets.SITE_BASE }}" | npx wrangler secret put SITE_BASE
-          fi
-          if [ -n "${{ secrets.REDIS_URL }}" ]; then
-            echo "${{ secrets.REDIS_URL }}" | npx wrangler secret put REDIS_URL
-          fi
-          if [ -n "${{ secrets.KVROCKS_URL }}" ]; then
-            echo "${{ secrets.KVROCKS_URL }}" | npx wrangler secret put KVROCKS_URL
-          fi
-          if [ -n "${{ secrets.INIT_CONFIG }}" ]; then
-            echo "${{ secrets.INIT_CONFIG }}" | npx wrangler secret put INIT_CONFIG
-          fi
-          if [ -n "${{ secrets.CONFIG_SUBSCRIPTION_URL }}" ]; then
-            echo "${{ secrets.CONFIG_SUBSCRIPTION_URL }}" | npx wrangler secret put CONFIG_SUBSCRIPTION_URL
-          fi
-        env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-
       - name: Deploy to Cloudflare
         uses: cloudflare/wrangler-action@v3
         with:
@@ -115,3 +60,53 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy
           packageManager: pnpm
+          preCommands: |
+            # 设置运行时环境变量到 Cloudflare
+            if [ -n "${{ secrets.USERNAME }}" ]; then
+              echo "${{ secrets.USERNAME }}" | wrangler secret put USERNAME
+            fi
+            if [ -n "${{ secrets.PASSWORD }}" ]; then
+              echo "${{ secrets.PASSWORD }}" | wrangler secret put PASSWORD
+            fi
+            if [ -n "${{ secrets.UPSTASH_URL }}" ]; then
+              echo "${{ secrets.UPSTASH_URL }}" | wrangler secret put UPSTASH_URL
+            fi
+            if [ -n "${{ secrets.UPSTASH_TOKEN }}" ]; then
+              echo "${{ secrets.UPSTASH_TOKEN }}" | wrangler secret put UPSTASH_TOKEN
+            fi
+            if [ -n "${{ secrets.TMDB_API_KEY }}" ]; then
+              echo "${{ secrets.TMDB_API_KEY }}" | wrangler secret put TMDB_API_KEY
+            fi
+            if [ -n "${{ secrets.TMDB_PROXY }}" ]; then
+              echo "${{ secrets.TMDB_PROXY }}" | wrangler secret put TMDB_PROXY
+            fi
+            if [ -n "${{ secrets.TMDB_REVERSE_PROXY }}" ]; then
+              echo "${{ secrets.TMDB_REVERSE_PROXY }}" | wrangler secret put TMDB_REVERSE_PROXY
+            fi
+            if [ -n "${{ secrets.DANMAKU_API_BASE }}" ]; then
+              echo "${{ secrets.DANMAKU_API_BASE }}" | wrangler secret put DANMAKU_API_BASE
+            fi
+            if [ -n "${{ secrets.DANMAKU_API_TOKEN }}" ]; then
+              echo "${{ secrets.DANMAKU_API_TOKEN }}" | wrangler secret put DANMAKU_API_TOKEN
+            fi
+            if [ -n "${{ secrets.ANNOUNCEMENT }}" ]; then
+              echo "${{ secrets.ANNOUNCEMENT }}" | wrangler secret put ANNOUNCEMENT
+            fi
+            if [ -n "${{ secrets.CRON_PASSWORD }}" ]; then
+              echo "${{ secrets.CRON_PASSWORD }}" | wrangler secret put CRON_PASSWORD
+            fi
+            if [ -n "${{ secrets.SITE_BASE }}" ]; then
+              echo "${{ secrets.SITE_BASE }}" | wrangler secret put SITE_BASE
+            fi
+            if [ -n "${{ secrets.REDIS_URL }}" ]; then
+              echo "${{ secrets.REDIS_URL }}" | wrangler secret put REDIS_URL
+            fi
+            if [ -n "${{ secrets.KVROCKS_URL }}" ]; then
+              echo "${{ secrets.KVROCKS_URL }}" | wrangler secret put KVROCKS_URL
+            fi
+            if [ -n "${{ secrets.INIT_CONFIG }}" ]; then
+              echo "${{ secrets.INIT_CONFIG }}" | wrangler secret put INIT_CONFIG
+            fi
+            if [ -n "${{ secrets.CONFIG_SUBSCRIPTION_URL }}" ]; then
+              echo "${{ secrets.CONFIG_SUBSCRIPTION_URL }}" | wrangler secret put CONFIG_SUBSCRIPTION_URL
+            fi