xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 7 Wiki Activity

fix(ci): 调整preview SSH key优先级，优先使用PREVIEW_SSH_KEY secret #515

Merged
auto-approve-bot merged 1 commits from fix/preview-ssh-key-priority into develop 2026-07-18 14:35:47 +08:00
Conversation 3 Commits 1 Files Changed 2
+14 -14
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/preview-cleanup.yml
+7 -7
View File
@@ -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
.gitea/workflows/preview-deploy.yml
Regular → Executable
+7 -7
View File
@@ -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