From 08d01a5bd20802c992c95918b2fb44883a4cd714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=20Poljan=C5=A1ek?= <mp2549@student.uni-lj.si>
Date: Tue, 9 Sep 2025 19:47:30 +0200
Subject: [PATCH] sprememba pipelinesov

---
 .gitea/workflows/deploy.yml | 62 +++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 477d9bb..61cdf0b 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,55 +1,51 @@
-name: Deploy to Production on Develop Push
+name: Deploy to Development and Production
 
- on:
+# 1. EN trigger, ki se sproži ob potisku na OBE veji
+on:
   push:
     branches:
       - develop
-
- jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-       - name: Deploy to Server via rsync
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          
-          rsync -avz --delete \
-            --exclude=".git/" \
-            --exclude=".gitea/" \
-            --exclude=".gitignore" \
-            -e "ssh -p ${{ secrets.SSH_PORT }} -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no" \
-            ./ \
-            ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.TARGET_DIR }} 
-
- on:
-  push:
-    branches:
       - master
 
- jobs:
+# 2. EN jobs blok
+jobs:
   deploy:
     runs-on: ubuntu-latest
 
-     steps:
+    steps:
+      # Ta korak se vedno izvede
       - name: Checkout repository
         uses: actions/checkout@v4
 
-       - name: Deploy to Server via rsync
+      # Ta korak se vedno izvede - priprava SSH ključa
+      - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-          
+      
+      # 3. KORAK ZA DEVELOP: Izvede se samo, če je veja 'develop'
+      - name: Deploy to Development Server
+        if: gitea.ref_name == 'develop'
+        run: |
+          echo "🚀 Deploying to Development..."
           rsync -avz --delete \
             --exclude=".git/" \
             --exclude=".gitea/" \
             --exclude=".gitignore" \
             -e "ssh -p ${{ secrets.SSH_PORT }} -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no" \
             ./ \
-            ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.TARGET_MASTER_DIR }} 
\ No newline at end of file
+            ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.TARGET_DIR }}
+
+      # 4. KORAK ZA MASTER: Izvede se samo, če je veja 'master'
+      - name: Deploy to Production Server
+        if: gitea.ref_name == 'master'
+        run: |
+          echo "🚀 Deploying to Production..."
+          rsync -avz --delete \
+            --exclude=".git/" \
+            --exclude=".gitea/" \
+            --exclude=".gitignore" \
+            -e "ssh -p ${{ secrets.SSH_PORT }} -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no" \
+            ./ \
+            ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.TARGET_MASTER_DIR }}
\ No newline at end of file