From 4ea62b3fa36d19dd4c17122cfb469b3d0ab2575e Mon Sep 17 00:00:00 2001 From: CI Bot Date: Sat, 18 Jul 2026 14:30:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E8=B0=83=E6=95=B4preview=20SSH=20ke?= =?UTF-8?q?y=E4=BC=98=E5=85=88=E7=BA=A7=EF=BC=8C=E4=BC=98=E5=85=88?= =?UTF-8?q?=E4=BD=BF=E7=94=A8PREVIEW=5FSSH=5FKEY=20secret?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/preview-cleanup.yml | 14 +++++++------- .gitea/workflows/preview-deploy.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) mode change 100644 => 100755 .gitea/workflows/preview-deploy.yml diff --git a/.gitea/workflows/preview-cleanup.yml b/.gitea/workflows/preview-cleanup.yml index 83791987a..7dca89b0b 100755 --- a/.gitea/workflows/preview-cleanup.yml +++ b/.gitea/workflows/preview-cleanup.yml @@ -84,19 +84,19 @@ jobs: mkdir -p ~/.ssh - # 查找可用的SSH密钥 + # 查找可用的SSH密钥(优先用 secret 里专门为 preview 配置的 key) key_path="" - if [ -f /root/.ssh/xiaoxia_runtime_builder ]; then + if [ -n "${PREVIEW_SSH_KEY:-}" ]; then + key_path="$HOME/.ssh/id_ed25519" + printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path" + chmod 600 "$key_path" + echo "Using key from PREVIEW_SSH_KEY secret" + elif [ -f /root/.ssh/xiaoxia_runtime_builder ]; then key_path="/root/.ssh/xiaoxia_runtime_builder" echo "Using key: $key_path (builder key)" elif [ -f "$HOME/.ssh/xiaoxia_runtime_builder" ]; then key_path="$HOME/.ssh/xiaoxia_runtime_builder" echo "Using key: $key_path (home key)" - elif [ -n "${PREVIEW_SSH_KEY:-}" ]; then - key_path="$HOME/.ssh/id_ed25519" - printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path" - chmod 600 "$key_path" - echo "Using key from PREVIEW_SSH_KEY secret" else echo "ERROR: No SSH key available" ls -la ~/.ssh/ 2>/dev/null || true diff --git a/.gitea/workflows/preview-deploy.yml b/.gitea/workflows/preview-deploy.yml old mode 100644 new mode 100755 index 28f4f5189..f9c0cef7b --- a/.gitea/workflows/preview-deploy.yml +++ b/.gitea/workflows/preview-deploy.yml @@ -164,19 +164,19 @@ jobs: mkdir -p ~/.ssh - # 查找可用的SSH密钥 + # 查找可用的SSH密钥(优先用 secret 里专门为 preview 配置的 key) key_path="" - if [ -f /root/.ssh/xiaoxia_runtime_builder ]; then + if [ -n "${PREVIEW_SSH_KEY:-}" ]; then + key_path="$HOME/.ssh/id_ed25519" + printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path" + chmod 600 "$key_path" + echo "Using key from PREVIEW_SSH_KEY secret" + elif [ -f /root/.ssh/xiaoxia_runtime_builder ]; then key_path="/root/.ssh/xiaoxia_runtime_builder" echo "Using key: $key_path (builder key)" elif [ -f "$HOME/.ssh/xiaoxia_runtime_builder" ]; then key_path="$HOME/.ssh/xiaoxia_runtime_builder" echo "Using key: $key_path (home key)" - elif [ -n "${PREVIEW_SSH_KEY:-}" ]; then - key_path="$HOME/.ssh/id_ed25519" - printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path" - chmod 600 "$key_path" - echo "Using key from PREVIEW_SSH_KEY secret" else echo "ERROR: No SSH key available" ls -la ~/.ssh/ 2>/dev/null || true -- 2.54.0