didnt work, trying something else

astroid-app · Aug 21, 2024 · 00714f9 · 00714f9
1 parent 4952033
commit 00714f9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/automated_api_deploy.yaml b/.github/workflows/automated_api_deploy.yaml
@@ -7,7 +7,6 @@ on:
 jobs:
   pull_changes:
     runs-on: ubuntu-latest
-    file-depth: 1
     steps:
       - name: API Shutdown
         uses: appleboy/ssh-action@master
@@ -28,7 +27,8 @@ jobs:
           port: ${{ secrets.SSH_PORT }}
           script: |
             cd /root/astroid
-            git pull origin main
+            git fetch origin main
+            git merge origin/main
   deploy:
     runs-on: ubuntu-latest
     steps:
@@ -40,4 +40,4 @@ jobs:
           password: ${{ secrets.SSH_PASSWORD }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            sudo systemctl start astroidapi
+            sudo systemctl start astroidapi