From 7393d0e04f0af55726474a596ef8a00df9eeef6d Mon Sep 17 00:00:00 2001
From: Ivan Popov <ma1n.py@yandex.ru>
Date: Wed, 16 Oct 2024 15:23:10 +0300
Subject: [PATCH] Fix Azamat code

---
 .github/workflows/deploy.yaml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index dc530c8..f29ac12 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -7,6 +7,8 @@ on:
     workflows: [build]
     types:
       - completed
+    branches:
+      - main
   workflow_dispatch:
 
 env:
@@ -14,22 +16,30 @@ env:
   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
   SSH_HOST: ${{ secrets.SSH_HOST }}
   SSH_USER: ${{ secrets.SSH_USER }}
-  
+  SSH_PORT: ${{ secrets.SSH_PORT }}
+
 
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
       - name: Set up SSH private key.
         run: eval "$(ssh-agent -s)"
       - run: mkdir -p ~/.ssh
-      - run: ssh-keyscan ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+      - run: ssh-keyscan -p $SSH_PORT $SSH_HOST >> ~/.ssh/known_hosts
       - run: ssh-agent -a $SSH_AUTH_SOCK > /dev/null
       - run: ssh-add - <<< "${{ secrets.SSH_KEY }}"
-      
+      - name: Add image tag to .version file
+        run: |
+          echo $IMAGE_TAG > .version
+          scp -P 666 .version $SSH_USER@$SSH_HOST:~/YetAnotherCalendar/.version
+
       - name: Update docker compose
         run: | 
-          ssh $SSH_USER@$SSH_HOST "cd YetAnotherCalendar/ && YET_ANOTHER_CALENDAR_VERSION=$IMAGE_TAG docker compose up -d --build"
-      
\ No newline at end of file
+          ssh $SSH_USER@$SSH_HOST -p $SSH_PORT "cd YetAnotherCalendar/ && git pull origin main
+          YET_ANOTHER_CALENDAR_VERSION=$(cat .version) docker compose -f docker-compose.prod.yaml pull
+          YET_ANOTHER_CALENDAR_VERSION=$(cat .version) docker compose -f docker-compose.prod.yaml up -d"
+    
\ No newline at end of file