250330 Try to improve workflows

Author: Gooraeng

.github/workflows/first-deployment.yml

@@ -1,62 +1,83 @@
 name: (Re)initialize Deployment
+run-name: (Re)initialize Deployment by ${{ github.actor }}
+
 on:
   workflow_dispatch:
+
 env:
   REPO_NAME: ${{ github.event.repository.name }}
-  VPS_IP: ${{ secrets.VPS_IP }}
-  VPS_USER: ${{ secrets.VPS_USER }}
+  VENV: "venv"
+  PYTHON: "3.12"
+
 jobs:
-  setup-venv:
+  clean-up-folder:
     runs-on: ubuntu-latest
     steps:
-      - name: Installing venv
+      - name: Remove Existing Folder
         uses: fifsky/ssh-action@master
         with:
           command: |
-            rm -rf venv
-            python3 -m venv venv
-            cd venv
-            mkdir ${{ env.REPO_NAME }}
-          host: ${{ env.VPS_IP }}
-          user: ${{ env.VPS_USER }}
+            rm -rf ${{ env.REPO_NAME }} && mkdir ${{ env.REPO_NAME }}
+          host: ${{ secrets.VPS_IP }}
+          user: ${{ secrets.VPS_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          args: "-tt"
+
+  setup-python:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install pip and venv
+        uses: fifsky/ssh-action@master
+        with:
+          command: |
+            export DEBIAN_FRONTEND=noninteractive
+            sudo apt-get install -y python${{env.PYTHON}}-pip python${{env.PYTHON}}-venv
+            pip --version
+
+          host: ${{ secrets.VPS_IP }}
+          user: ${{ secrets.VPS_USER }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           args: "-tt"
 
   deploy-via-sftp:
-    needs: [setup-venv]
+    needs: [ clean-up-folder, setup-python ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Deploy to Server
         uses: wlixcc/SFTP-Deploy-Action@v1.2.5
         with:
-          username: ${{ env.VPS_USER }}
-          server: ${{ env.VPS_IP }}
-          port: 22
+          username: ${{ secrets.VPS_USER }}
+          server: ${{ secrets.VPS_IP }}
+          port: ${{secrets.PORT}}
           ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
           # clones entire github repo
           local_path: ./*
           # destination of the code on the server
-          remote_path: ./venv/${{ env.REPO_NAME }}/
-          sftpargs: '-o ConnectTimeout=5'
+          remote_path: ./${{ env.REPO_NAME }}
+          sftpArgs: '-o ConnectTimeout=15'
 
-  install-dependencies:
-    needs: [deploy-via-sftp]
+  install-requirements:
+    needs: [ deploy-via-sftp ]
     runs-on: ubuntu-latest
     steps:
-      - name: Installing requirements for ${{ env.REPO_NAME }}
+      - name: Install Requirements
         uses: fifsky/ssh-action@master
         with:
-          # install the libraries required for your bot
-          # setup venv and then install the requirements
           command: |
-            source venv/bin/activate
+            cd ${{ env.REPO_NAME }}
+            python3 -m venv ${{env.VENV}}
+            source ${{env.VENV}}/bin/activate
             pip install --upgrade pip
-            pip install -U -r ./venv/${{ env.REPO_NAME }}/requirements.txt
-          host: ${{ env.VPS_IP }}
-          user: ${{ env.VPS_USER }}
+            pip install -U -r ./requirements.txt
+          host: ${{ secrets.VPS_IP }}
+          user: ${{ secrets.VPS_USER }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           args: "-tt"
 
@@ -69,7 +90,7 @@ jobs:
         uses: fifsky/ssh-action@master
         with:
           command: |
-            cd ./venv/${{ env.REPO_NAME }}
+            cd ${{ env.REPO_NAME }}
             echo "DISCORD_API_TOKEN=${{ secrets.DISCORD_API_TOKEN }}" > .env
             echo "DISCORD_API_TOKEN_TEST=${{ secrets.DISCORD_API_TOKEN_TEST }}" >> .env
             echo "REFER_DB=${{ secrets.REFER_DB }}" >> .env
@@ -89,7 +110,7 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
 
   create-systemctl-service:
-    needs: [add-secret-variables, install-dependencies]
+    needs: [add-secret-variables, install-requirements]
     runs-on: ubuntu-latest
     steps:
       - id: creating-systemctl-service

.github/workflows/update-bot.yml

@@ -1,10 +1,13 @@
 name: Update Bot
+
 on:
   push:
     branches: [ production ]
   workflow_dispatch:
+
 env:
   REPO_NAME: ${{ github.event.repository.name }}
+
 jobs:
   deploy-via-sftp:
     runs-on: ubuntu-latest
@@ -15,11 +18,11 @@ jobs:
         with:
           username: ${{ secrets.VPS_USER }}
           server: ${{ secrets.VPS_IP }}
-          port: 22
+          port: ${{ secrets.PORT }}
           ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
           local_path: ./*
-          remote_path: ./venv/${{ env.REPO_NAME }}/
-          sftpargs: '-o ConnectTimeout=5'
+          remote_path: ./${{ env.REPO_NAME }}/
+          sftpArgs: '-o ConnectTimeout=15'
 
   restart-bot:
     needs: [deploy-via-sftp]