diff --git a/.github/workflows/deploy.sh b/.github/workflows/deploy.sh index c125d57..05198fe 100644 --- a/.github/workflows/deploy.sh +++ b/.github/workflows/deploy.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -# Create SSH key file with proper handling -echo "$SSH_KEY" > key.pem +# Create SSH key file with proper handling, stripping Windows-style line endings +printf '%s' "$SSH_KEY" | tr -d '\r' > key.pem chmod 600 key.pem # Verify key file was created properly @@ -17,6 +17,8 @@ echo "Deploying to $SSH_USER@$SSH_HOST..." scp -o StrictHostKeyChecking=no \ -o UserKnownHostsFile=/dev/null \ -o ConnectTimeout=10 \ + -o BatchMode=yes \ + -o PasswordAuthentication=no \ -i key.pem \ unchain unchain.service \ "${SSH_USER}@${SSH_HOST}:~" @@ -25,6 +27,8 @@ scp -o StrictHostKeyChecking=no \ ssh -o StrictHostKeyChecking=no \ -o UserKnownHostsFile=/dev/null \ -o ConnectTimeout=10 \ + -o BatchMode=yes \ + -o PasswordAuthentication=no \ -i key.pem \ "${SSH_USER}@${SSH_HOST}" << 'SSHEOF' set -e diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7ee1b79..c07064a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -40,9 +40,9 @@ jobs: GIT_REPO: ${{ github.repository }} run: | echo "Building Go application with gitHash=${{ env.gitHash }} and buildTime=${{ env.buildTime }}" - go build -ldflags="-X 'main.gitHash=${{ github.sha }}' -X 'main.buildTime=${{ env.buildTime }}'" -o unchain .ldTime=${{ env.buildTime }}'" -o unchain . + go build -ldflags="-X 'main.gitHash=${{ github.sha }}' -X 'main.buildTime=${{ env.buildTime }}'" -o unchain . - - name: Deploy to AliCould ECS + - name: Deploy to AliCloud ECS env: SSH_HOST: ${{ secrets.ECS_HOST }} SSH_USER: ${{ secrets.ECS_USER }} @@ -50,4 +50,3 @@ jobs: CONFIG_TOML: ${{ vars.CONFIG_TOML }} run: bash .github/workflows/deploy.sh # add more server to deploy -