fix: support raw deploy ssh key secret

2026-06-27 10:58:02 +09:00
parent 928fc0de37
commit 2e67e52391
1 changed files with 22 additions and 2 deletions
@@ -56,7 +56,17 @@ jobs:

          echo "=== Deploying TaxBaik v$(git rev-parse --short HEAD) ==="
          mkdir -p ~/.ssh
-          printf '%s' "${{ secrets.DEPLOY_SSH_KEY_B64 }}" | base64 -d > ~/.ssh/id_ed25519
+          SSH_KEY_B64="${{ secrets.DEPLOY_SSH_KEY_B64 }}"
+          SSH_KEY_RAW="${{ secrets.DEPLOY_SSH_KEY }}"
+          if [ -n "$SSH_KEY_B64" ]; then
+            printf '%s' "$SSH_KEY_B64" | base64 -d > ~/.ssh/id_ed25519
+          elif [ -n "$SSH_KEY_RAW" ]; then
+            printf '%s\n' "$SSH_KEY_RAW" > ~/.ssh/id_ed25519
+          else
+            echo "Missing DEPLOY_SSH_KEY_B64 or DEPLOY_SSH_KEY secret" >&2
+            exit 1
+          fi
+          sed -i 's/\r$//' ~/.ssh/id_ed25519
          chmod 600 ~/.ssh/id_ed25519
          ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts 2>/dev/null || true

@@ -79,7 +89,17 @@ jobs:
          DEPLOY_HOST="${{ secrets.DEPLOY_HOST }}"
          DEPLOY_USER="${{ secrets.DEPLOY_USER }}"
          mkdir -p ~/.ssh
-          printf '%s' "${{ secrets.DEPLOY_SSH_KEY_B64 }}" | base64 -d > ~/.ssh/id_ed25519
+          SSH_KEY_B64="${{ secrets.DEPLOY_SSH_KEY_B64 }}"
+          SSH_KEY_RAW="${{ secrets.DEPLOY_SSH_KEY }}"
+          if [ -n "$SSH_KEY_B64" ]; then
+            printf '%s' "$SSH_KEY_B64" | base64 -d > ~/.ssh/id_ed25519
+          elif [ -n "$SSH_KEY_RAW" ]; then
+            printf '%s\n' "$SSH_KEY_RAW" > ~/.ssh/id_ed25519
+          else
+            echo "Missing DEPLOY_SSH_KEY_B64 or DEPLOY_SSH_KEY secret" >&2
+            exit 1
+          fi
+          sed -i 's/\r$//' ~/.ssh/id_ed25519
          chmod 600 ~/.ssh/id_ed25519
          ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts 2>/dev/null || true
          sleep 10