Update deploy-on-v2-commit.yml

.github/workflows/deploy-on-v2-commit.yml

@@ -28,13 +28,39 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Get commit hashes
+      - name: Get commit hashes for frontend and backend
         id: commit-hashes
         run: |
-          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "no-frontend-changes")
+          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
-          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "no-backend-changes")
+          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
+          if [ -z "$FRONTEND_HASH" ]; then
+            FRONTEND_HASH="no-frontend-changes"
+          fi
+          
+          # Get last commit that touched backend code, docker/backend, or docker/compose
+          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
+          if [ -z "$BACKEND_HASH" ]; then
+            BACKEND_HASH="no-backend-changes"
+          fi
+          
+          echo "Frontend hash: $FRONTEND_HASH"
+          echo "Backend hash: $BACKEND_HASH"
+          
+          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
+          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
+          
+          # Short hashes for tags
+          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
+            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
+          else
             echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
+          fi
+          
+          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
+            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
+          else
             echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
+          fi
 
       - name: Check if frontend image exists
         id: check-frontend
@@ -58,6 +84,7 @@ jobs:
             echo "Backend image needs to be built"
           fi
 
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -96,7 +123,7 @@ jobs:
 
       - name: Deploy to VPS on port 3000
         run: |
-          export UNIQUE_NAME=docker-compose-v2-${{ github.run_id }}.yml
+          export UNIQUE_NAME=docker-compose-v2-$GITHUB_RUN_ID.yml
       
           cat > $UNIQUE_NAME << EOF
           version: '3.3'
@@ -148,3 +175,9 @@ jobs:
             docker system prune -af --volumes
             docker image prune -af --filter "until=336h" --filter "label!=keep=true"
           ENDSSH
+
+      - name: Cleanup temporary files
+        if: always()
+        run: |
+          rm -f ../private.key
+