fix build 2
This commit is contained in:
@@ -155,7 +155,10 @@ jobs:
|
|||||||
echo "Using SSH host $VPS_HOST"
|
echo "Using SSH host $VPS_HOST"
|
||||||
mkdir -p ~/.ssh && chmod 700 ~/.ssh
|
mkdir -p ~/.ssh && chmod 700 ~/.ssh
|
||||||
if [ -n "$VPS_SSH_KEY_B64" ]; then
|
if [ -n "$VPS_SSH_KEY_B64" ]; then
|
||||||
printf '%s' "$VPS_SSH_KEY_B64" | tr -d '[:space:]' | base64 -d > ~/.ssh/id_rsa
|
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
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
|
printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
|
||||||
fi
|
fi
|
||||||
@@ -335,7 +338,10 @@ jobs:
|
|||||||
echo "Using SSH host $VPS_HOST"
|
echo "Using SSH host $VPS_HOST"
|
||||||
mkdir -p ~/.ssh && chmod 700 ~/.ssh
|
mkdir -p ~/.ssh && chmod 700 ~/.ssh
|
||||||
if [ -n "$VPS_SSH_KEY_B64" ]; then
|
if [ -n "$VPS_SSH_KEY_B64" ]; then
|
||||||
printf '%s' "$VPS_SSH_KEY_B64" | tr -d '[:space:]' | base64 -d > ~/.ssh/id_rsa
|
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
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
|
printf '%b\n' "$VPS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user