Update .woodpecker.yml

Reviewed-on: #22

.woodpecker.yml

@@ -1,9 +1,4 @@
 skip_clone: true
-when:
-  event: pull_request
-  action:
-    - merge
-  branch: master
 steps:
   debug-location:
     image: alpine
@@ -23,7 +18,7 @@ steps:
       - |
         set -euf
         cd "${CI_WORKSPACE}"
-        echo "Aktualna ścieżka do pliku: $(pwd)"
+        echo "Aktualna ścieżka: $(pwd)"
         echo "=== Restore wszystkich projektów ==="
         find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
   test:
@@ -79,6 +74,7 @@ steps:
         ls -la nupkg/ || echo "Brak spakowanych pakietów!"
     depends_on: [test]
   
+  # NOWY KROK: Publish LinuxLocal apps
   publish-linux-local:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
@@ -86,32 +82,21 @@ steps:
         set -euf
         cd "${CI_WORKSPACE}"
         mkdir -p linux-apps
-
-        echo "=== Konfiguracja NuGet sources ==="
-        cat <<EOF > NuGet.Config
-        <?xml version="1.0" encoding="utf-8"?>
-        <configuration>
-          <packageSources>
-            <clear />
-            <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-            <add key="BaGet" value="http://baget:80/v3/index.json" allowInsecureConnections="true" />
-          </packageSources>
-        </configuration>
-        EOF
         
         echo "=== Publikacja aplikacji LinuxLocal ==="
         find . -name "*.csproj" -type f | while read csproj; do
           PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
-        
+          
           if [ "$PROJECT_TYPE" = "LinuxLocal" ]; then
             PROJECT_NAME=$(basename "$csproj" .csproj)
             echo "→ Publishing $PROJECT_NAME"
-        
+            
             dotnet publish "$csproj" \
               --configuration Release \
               --output "./linux-apps/$PROJECT_NAME" \
               --runtime linux-x64 \
-              --self-contained false
+              --self-contained false \
+              --no-restore
           fi
         done
         
@@ -167,7 +152,7 @@ steps:
         find . -name "*.csproj" -type f | while read csproj; do
           PROJECT_NAME=$(basename "$csproj" .csproj)
           PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
-        
+          
           if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then
             PROJECT_DIR=$(dirname "$csproj")
             echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)"
@@ -201,10 +186,6 @@ steps:
         
         REGISTRY_ORG="fa"
         
-        echo "=== DEBUG: Zawartość projects-to-build.txt ==="
-        cat projects-to-build.txt || echo "Plik nie istnieje!"
-        echo "=== DEBUG: REGISTRY_ORG = '$REGISTRY_ORG' ==="
-        
         echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
         
         if [ ! -s projects-to-build.txt ]; then
@@ -228,20 +209,16 @@ steps:
         cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do
           PDIR=$(echo "$PDIR" | xargs)
           PNAME=$(echo "$PNAME" | xargs)
-        
+          
-          echo "=== DEBUG: PDIR='$PDIR' PNAME='$PNAME' ==="
-        
           test -z "$PNAME" && continue
           test ! -d "$PDIR" && continue
-        
+          
-          echo -n "git.modwad.pl/fa/" > /tmp/tag.txt
+          echo -n "git.modwad.pl/${REGISTRY_ORG}/" > /tmp/tag.txt
           echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt
-        
+          
-          echo "=== DEBUG: Generated tag: $(cat /tmp/tag.txt) ==="
-        
           echo "$PNAME" > /tmp/pname.txt
           echo "$PDIR" | sed 's|^\./||' > /tmp/pdir.txt
-        
+          
           cat > "Dockerfile.temp" <<'ENDOFDOCKERFILE'
         FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
         WORKDIR /app
@@ -257,11 +234,11 @@ steps:
         ENV ASPNETCORE_URLS=http://+:8080
         ENTRYPOINT ["dotnet", "%%PROJECTNAME%%.dll"]
         ENDOFDOCKERFILE
-        
+          
           REAL_PNAME=$(cat /tmp/pname.txt)
           REAL_PDIR=$(cat /tmp/pdir.txt)
           sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final"
-        
+          
           echo "=== Budowanie obrazu ==="
           DOCKER_BUILDKIT=0 docker build \
             --network=host \
@@ -269,66 +246,51 @@ steps:
             -t "$(cat /tmp/tag.txt):latest" \
             -f "Dockerfile.final" \
             .
-        
+          
           echo "=== Pushing SHA tag ==="
           docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}"
-        
+          
           echo "=== Pushing latest tag ==="
           docker push "$(cat /tmp/tag.txt):latest"
-        
+          
           echo "=== SUCCESS: $(cat /tmp/tag.txt) ==="
-        
+          
           rm -f "Dockerfile.temp" "Dockerfile.final"
         done
         
         echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ==="
     depends_on: [select-projects-for-container]
   
+  # NOWY KROK: Deploy LinuxLocal na serwer
   deploy-linux-local:
     image: alpine:latest
     commands:
       - |
+        set -euf
         cd "${CI_WORKSPACE}"
         
-        echo "=== Sprawdzanie aplikacji LinuxLocal ==="
+        if [ ! -d "./linux-apps" ] || [ ! "$(ls -A ./linux-apps)" ]; then
-        if [ ! -d "./linux-apps" ]; then
+          echo "Brak aplikacji LinuxLocal do wdrożenia"
-          echo "Folder ./linux-apps nie istnieje"
           exit 0
         fi
         
-        echo "=== DEBUG: Zawartość ./linux-apps/ ==="
-        ls -la ./linux-apps/
-        
         echo "=== Wdrażanie aplikacji LinuxLocal do /opt/fa-apps/ ==="
         mkdir -p /opt/fa-apps
         
-        cd ./linux-apps
+        for app in ./linux-apps/*; do
-        
+          APP_NAME=$(basename "$app")
-        for app in *; do
+          echo "→ Kopiuję $APP_NAME"
-          echo "→ DEBUG: Sprawdzam $app"
           
-          if [ ! -d "$app" ]; then
+          rm -rf "/opt/fa-apps/$APP_NAME"
-            echo "  → $app nie jest folderem, pomijam"
+          cp -r "$app" "/opt/fa-apps/$APP_NAME"
-            continue
-          fi
           
-          echo "  → Kopiuję $app"
+          # Nadaj uprawnienia wykonywania
-          echo "  → Zawartość:"
+          chmod +x "/opt/fa-apps/$APP_NAME/$APP_NAME"
-          ls -la "$app/"
-          
-          rm -rf "/opt/fa-apps/$app"
-          cp -r "$app" "/opt/fa-apps/$app"
-          
-          find "/opt/fa-apps/$app" -type f -executable -exec chmod +x {} \;
-          
-          echo "  → Skopiowano!"
         done
         
-        cd "${CI_WORKSPACE}"
-        
         echo ""
         echo "=== Wdrożone aplikacje ==="
-        ls -laR /opt/fa-apps/
+        ls -la /opt/fa-apps/
     depends_on: [publish-linux-local, containerize-apps]
   
   cleanup-docker:
@@ -362,4 +324,4 @@ steps:
         docker system df
     depends_on: [deploy-linux-local]
     when:
-      status: [success, failure]
+      status: [success, failure]