From fbe088c395418144642187bfc402290750445cf7 Mon Sep 17 00:00:00 2001
From: shockrah <dev@shockrah.xyz>
Date: Thu, 5 Sep 2024 21:14:45 -0700
Subject: [PATCH] new method of setting up ssh-agent

---
 .gitea/workflows/build-and-deploy.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml
index e11ab53..f95ed0f 100644
--- a/.gitea/workflows/build-and-deploy.yml
+++ b/.gitea/workflows/build-and-deploy.yml
@@ -17,10 +17,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Build website content
         run: hugo
-      - name: SSH setup and copying
-        run: |
-          eval $(ssh-agent -s) \
-          echo "${{ secrets.PRIVATE_KEY }}" | ssh-add - > /dev/null \
-          mkdir -p ~/.ssh \
-          chmod 0700 ~/.ssh \
-          scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path
+      - name: Create tmp .ssh directory
+        run: mkdir -p ~/.ssh
+      - name: Ensure perms on tmp .ssh directory
+        run: chmod 0700 ~/.ssh
+      - name: Setup ssh agent
+        run: ssh-agent -a /tmp/ssh_agent.sock -s > /dev/null
+      - name: Add private key to agent
+        run: echo "${{ secrets.PRIVATE_KEY }}" | ssh-add - > /dev/null
+      - name: SCP Files to resume web server
+        run: "scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path"