set ssh-agent env variables where needed

OiCMudkips · Apr 19, 2024 · a5538f1 · a5538f1
1 parent c2b6d78
commit a5538f1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -19,11 +19,15 @@ jobs:
           ssh-keyscan "${{ secrets.VICTORZHOUDEV_SSH_HOST }}" >> ~/.ssh/known_hosts
           SSH_KEY=`mktemp -p "${GITHUB_WORKSPACE}" id_rsaXXXXXX`
           echo "${{ secrets.VICTORZHOUDEV_SSH_KEY }}" >> "${SSH_KEY}"
-          eval `ssh-agent`
+          SSH_AGENT_SETUP=$(ssh-agent)
+          eval "${SSH_AGENT_SETUP}"
           DISPLAY=1 SSH_ASKPASS="${GITHUB_WORKSPACE}/.github/util/print_ssh_passphrase.sh" ssh-add "${SSH_KEY}"
+          echo "SSH_AGENT_SETUP=${SSH_AGENT_SETUP}" >> $GITHUB_ENV
       - name: Deploy main website
+        env:
+          SSH_AGENT_SETUP: ${{ env.SSH_AGENT_SETUP }}
         run: |
-          echo "$SSH_AUTH_SOCK"
+          eval "${SSH_AGENT_SETUP}"
           ssh -vvv "${{ secrets.VICTORZHOUDEV_SSH_ADDRESS }}" "rm /home/public/*"
           scp -vvv "${GITHUB_WORKSPACE}/src/*" "${{ secrets.VICTORZHOUDEV_SSH_ADDRESS }}:/home/public/"
       - name: Install Python environment
@@ -33,7 +37,10 @@ jobs:
       - name: Install Python dependencies
         run: pip install -r "${GITHUB_WORKSPACE}/feed/requirements.txt"
       - name: Generate and upload RSS feed files
+        env:
+          SSH_AGENT_SETUP: ${{ env.SSH_AGENT_SETUP }}
         run: |
+          eval "${SSH_AGENT_SETUP}" 
           ATOM_OUTPUT_PATH="${GITHUB_WORKSPACE}/feed/atom.xml" RSS_OUTPUT_PATH="${GITHUB_WORKSPACE}/feed/rss.xml" python "${GITHUB_WORKSPACE}/feed/generate.py"
           scp "${GITHUB_WORKSPACE}/feed/atom.xml" "${{ secrets.VICTORZHOUDEV_SSH_ADDRESS }}:/home/public/feed/"
           scp "${GITHUB_WORKSPACE}/feed/rss.xml" "${{ secrets.VICTORZHOUDEV_SSH_ADDRESS }}:/home/public/feed/"