From cbef949a5aca08efd07c5b5cf0c5d43b0e6b8e9f Mon Sep 17 00:00:00 2001 From: kjh2064 Date: Sat, 27 Jun 2026 11:01:48 +0900 Subject: [PATCH] fix: decode deploy ssh key fallback --- .gitea/workflows/deploy.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 86f1a0a..de2f43c 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -61,7 +61,11 @@ jobs: if [ -n "$SSH_KEY_B64" ]; then printf '%s' "$SSH_KEY_B64" | base64 -d > ~/.ssh/id_ed25519 elif [ -n "$SSH_KEY_RAW" ]; then - printf '%b\n' "$SSH_KEY_RAW" > ~/.ssh/id_ed25519 + if printf '%s' "$SSH_KEY_RAW" | grep -q 'BEGIN .*PRIVATE KEY'; then + printf '%b\n' "$SSH_KEY_RAW" > ~/.ssh/id_ed25519 + else + printf '%s' "$SSH_KEY_RAW" | base64 -d > ~/.ssh/id_ed25519 + fi else echo "Missing DEPLOY_SSH_KEY_B64 or DEPLOY_SSH_KEY secret" >&2 exit 1 @@ -94,7 +98,11 @@ jobs: if [ -n "$SSH_KEY_B64" ]; then printf '%s' "$SSH_KEY_B64" | base64 -d > ~/.ssh/id_ed25519 elif [ -n "$SSH_KEY_RAW" ]; then - printf '%b\n' "$SSH_KEY_RAW" > ~/.ssh/id_ed25519 + if printf '%s' "$SSH_KEY_RAW" | grep -q 'BEGIN .*PRIVATE KEY'; then + printf '%b\n' "$SSH_KEY_RAW" > ~/.ssh/id_ed25519 + else + printf '%s' "$SSH_KEY_RAW" | base64 -d > ~/.ssh/id_ed25519 + fi else echo "Missing DEPLOY_SSH_KEY_B64 or DEPLOY_SSH_KEY secret" >&2 exit 1