From 7885f6790eb2253fad45322aea8a6a9b7cf33a58 Mon Sep 17 00:00:00 2001
From: Roger Gonzalez <roger@rogs.me>
Date: Wed, 14 May 2025 20:08:17 -0300
Subject: [PATCH] Combine SSH setup and deployment

- Consolidates SSH setup and deployment into a single step.
- Simplifies the deployment workflow by combining steps.
- Uses a more concise SSH command for deployment.
- Removes unnecessary SSH key agent initialization.
- Uses relative path `repo` in the deployment command.
---
 .gitea/workflows/deploy.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 6c47380..b472a11 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Setup SSH
+      - name: Setup SSH agent and deploy
         run: |
           eval "$(ssh-agent -s)"
           mkdir -p ~/.ssh
@@ -21,15 +21,10 @@ jobs:
           chmod 700 ~/.ssh
           ssh-keyscan "$SSH_HOST" >> ~/.ssh/known_hosts
           chmod 644 ~/.ssh/known_hosts
+
+          ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "cd repo && git stash && git pull --force origin master && ./build.sh"
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          SSH_HOST: ${{ secrets.SSH_HOST }}
-
-
-      - name: Deploy via SSH
-        run: |
-          ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" 'cd /home/rogsme/repo && git stash && git pull --force origin master && ./build.sh'
-        env:
           SSH_USER: ${{ secrets.SSH_USER }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
           SSH_PORT: ${{ secrets.SSH_PORT }}