build fix 8

2026-07-04 15:30:50 -04:00
parent fbbd5e4c1c
commit 2436907dc2
2 changed files with 15 additions and 4 deletions
@@ -160,8 +160,13 @@ jobs:
          mkdir -p ~/.ssh && chmod 700 ~/.ssh
          if [ -n "$VPS_SSH_KEY_B64" ]; then
            if ! printf '%s' "$VPS_SSH_KEY_B64" | tr -d '[:space:]' | base64 -d > ~/.ssh/id_rsa 2>/tmp/vps_ssh_key_decode.err; then
-              echo "::warning::VPS_SSH_KEY_B64 is not valid base64; trying it as a raw private key value"
-              printf '%b\n' "$VPS_SSH_KEY_B64" | tr -d '\r' > ~/.ssh/id_rsa
+              if [ -n "$VPS_SSH_KEY" ]; then
+                echo "::warning::VPS_SSH_KEY_B64 is not valid base64; using VPS_SSH_KEY instead"
+                printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
+              else
+                echo "::error::VPS_SSH_KEY_B64 is not valid base64. Store a base64-encoded private key there, or set VPS_SSH_KEY to the raw private key."
+                exit 1
+              fi
            fi
          else
            printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
@@ -376,8 +381,13 @@ jobs:
          mkdir -p ~/.ssh && chmod 700 ~/.ssh
          if [ -n "$VPS_SSH_KEY_B64" ]; then
            if ! printf '%s' "$VPS_SSH_KEY_B64" | tr -d '[:space:]' | base64 -d > ~/.ssh/id_rsa 2>/tmp/vps_ssh_key_decode.err; then
-              echo "::warning::VPS_SSH_KEY_B64 is not valid base64; trying it as a raw private key value"
-              printf '%b\n' "$VPS_SSH_KEY_B64" | tr -d '\r' > ~/.ssh/id_rsa
+              if [ -n "$VPS_SSH_KEY" ]; then
+                echo "::warning::VPS_SSH_KEY_B64 is not valid base64; using VPS_SSH_KEY instead"
+                printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
+              else
+                echo "::error::VPS_SSH_KEY_B64 is not valid base64. Store a base64-encoded private key there, or set VPS_SSH_KEY to the raw private key."
+                exit 1
+              fi
            fi
          else
            printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa