sprememba pipelinesov

.gitea/workflows/deploy.yml

@@ -1,24 +1,34 @@
-name: Deploy to Production on Develop Push
+name: Deploy to Development and Production
 
+# 1. EN trigger, ki se sproži ob potisku na OBE veji
 on:
   push:
     branches:
       - develop
+      - master
 
+# 2. EN jobs blok
 jobs:
   deploy:
     runs-on: ubuntu-latest
 
     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/" \
@@ -27,25 +37,11 @@ name: Deploy to Production on Develop Push
             ./ \
             ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.TARGET_DIR }}
 
- on:
+      # 4. KORAK ZA MASTER: Izvede se samo, če je veja 'master'
-  push:
+      - name: Deploy to Production Server
-    branches:
+        if: gitea.ref_name == 'master'
-      - master
-
- 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 "🚀 Deploying to Production..."
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          
           rsync -avz --delete \
             --exclude=".git/" \
             --exclude=".gitea/" \