diff --git a/.woodpecker.yml b/.woodpecker.yml index c9296ed..9e8913f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,158 +5,42 @@ when: - merge branch: master steps: - clone-manual: - image: woodpeckerci/plugin-git - settings: - remote: http://gitea:3000/${CI_REPO}.git - branch: ${CI_COMMIT_BRANCH} - depth: 1 - detect-changed-projects: - image: alpine - commands: - - | - set -euf - cd "${CI_WORKSPACE}" - - echo "CI_PIPELINE_FILES=${CI_PIPELINE_FILES:-}" - - apk add --no-cache findutils - - > changed-projects.txt - - echo "${CI_PIPELINE_FILES:-}" \ - | sed 's/^\[//; s/\]$//' \ - | tr ',' '\n' \ - | sed 's/^ *//; s/ *$//' \ - | sed '/^$/d' \ - | while read path; do - echo "→ changed file: $path" - - dir=$(dirname "$path") - while [ "$dir" != "." ] && [ "$dir" != "/" ]; do - csproj=$(find "$dir" -maxdepth 1 -name "*.csproj" -type f | head -n 1 || true) - if [ -n "$csproj" ]; then - echo "$csproj" >> changed-projects.txt - break - fi - dir=$(dirname "$dir") - done - done - - # unikalne projekty - sort -u -o changed-projects.txt changed-projects.txt - - echo "Zmienione projekty:" - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pipeline zakonczony." - # exit 0 = sukces, wiec kolejne kroki, ktore od niego zaleza, nie poleca - exit 0 - fi - cat changed-projects.txt - depends_on: [clone-manual] debug-location: image: alpine commands: - pwd - ls -la - find /woodpecker -maxdepth 4 -type d 2>/dev/null - depends_on: [detect-changed-projects] + clone-manual: + image: woodpeckerci/plugin-git + settings: + remote: http://gitea:3000/FA/FA_WEB.git + branch: master + depth: 1 restore: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - echo "Aktualna ścieżka do pliku: $(pwd)" + echo "Aktualna ścieżka: $(pwd)" echo "=== Restore wszystkich projektów ===" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektów – nic do restore." - exit 0 - fi - - cat < NuGet.Config - - - - - - - - - EOF - - echo "=== Restore zmienionych projektów ===" - while read csproj; do - echo "→ dotnet restore $csproj" - dotnet restore "$csproj" - done < changed-projects.txt - -# find . -name "*.csproj" -type f -exec dotnet restore "{}" \; - depends_on: [detect-changed-projects] + find . -name "*.csproj" -type f -exec dotnet restore "{}" \; test: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam test." - exit 0 - fi - - echo "=== Konfiguracja NuGet sources ===" - cat < NuGet.Config - - - - - - - - - EOF - - echo "=== Uruchamianie testów dla zmienionych projektow ===" - while read csproj; do - echo "→ dotnet test $csproj" - dotnet test --configuration Release --logger "trx;LogFileName=tests.trx" --results-directory TestResults - done < changed-projects.txt + echo "=== Uruchamianie testów ===" + dotnet test --no-restore --configuration Release --logger "trx" depends_on: [restore] - pipeline-agent: - image: mcr.microsoft.com/dotnet/sdk:latest - environment: - OPENAI_API_KEY: - from_secret: openai_api_key - VAULT_URL: - from_secret: vault_url - VAULT_TOKEN: - from_secret: vault_token - commands: - - | - set -euf - cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam AI-gate." - exit 0 - fi - - dotnet run --project PipelineAgent/PipelineAgent.csproj "check-changes" "$(pwd)" - depends_on: [detect-changed-projects] pack-datamodels: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam pack-datamodels." - exit 0 - fi - echo "=== Instalacja MinVer CLI ===" dotnet tool install --tool-path /tmp/minver minver-cli echo "=== Obliczona wersja przez MinVer ===" @@ -178,7 +62,7 @@ steps: find . -name "*.csproj" -type f | sort mkdir -p nupkg echo "=== Pakowanie projektów DataModel (wykrywane po obecności ) ===" - while read csproj; do + find . -name "*.csproj" -type f | while read csproj; do if grep -q '' "$csproj"; then PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pakuję $PROJECT_NAME ($csproj)" @@ -190,66 +74,10 @@ steps: PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME – brak " fi - done < changed-projects.txt + done echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" - #depends_on: [ai-agent-gate] depends_on: [test] - - publish-linux-local: - image: mcr.microsoft.com/dotnet/sdk:latest - commands: - - | - set -euf - cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam AI-gate." - exit 0 - fi - - mkdir -p linux-apps - - echo "=== Konfiguracja NuGet sources ===" - cat < NuGet.Config - - - - - - - - - EOF - - echo "=== Publikacja aplikacji LinuxLocal ===" - #find . -name "*.csproj" -type f | while read csproj; do - 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 - fi - #done - done < changed-projects.txt - - echo "" - if [ -d "./linux-apps" ] && [ "$(ls -A ./linux-apps)" ]; then - echo "Opublikowane aplikacje:" - ls -la linux-apps/ - else - echo "Brak aplikacji LinuxLocal do publikacji" - fi - #depends_on: [ai-agent-gate] - depends_on: [test] - publish-datamodels-to-baget: image: mcr.microsoft.com/dotnet/sdk:latest environment: @@ -259,12 +87,6 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam publish-datamodels-to-baget." - exit 0 - fi - echo "=== Test połączenia z BaGetter ===" curl -f http://baget:80/v3/index.json || echo "Nie można połączyć się z BaGetter!" cat < NuGet.Config @@ -286,7 +108,6 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - select-projects-for-container: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -294,38 +115,25 @@ steps: set -euf cd "${CI_WORKSPACE}" > projects-to-build.txt - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam select-projects-for-container." - exit 0 - fi - echo "=== Selekcja projektów do konteneryzacji ===" - #find . -name "*.csproj" -type f | while read csproj; do - while read csproj; do - PROJECT_NAME=$(basename "$csproj" .csproj) + 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" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then + + if [[ "$PROJECT_TYPE" == "Linux" || "$PROJECT_TYPE" == "Api" || "$PROJECT_TYPE" == "ServerProcess" || "$PROJECT_TYPE" == "Blazor" ]]; then + PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_DIR=$(dirname "$csproj") echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt else + PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)" fi - #done - done < changed-projects.txt + done - echo "" - if [ -s projects-to-build.txt ]; then - echo "Znalezione projekty:" - cat projects-to-build.txt - echo "Łącznie: $(wc -l < projects-to-build.txt)" - else - echo "BRAK PROJEKTÓW DO BUDOWY!" - fi + echo "=== Znaleziono projektow do budowy ===" + cat projects-to-build.txt || echo "Brak projektów!" + wc -l < projects-to-build.txt depends_on: [publish-datamodels-to-baget] - containerize-apps: image: docker:27-cli environment: @@ -337,17 +145,6 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam contenerize-apps." - exit 0 - fi - - 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 @@ -372,20 +169,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 "$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 @@ -401,114 +194,47 @@ 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 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -f "Dockerfile.final" \ - . - + . || { echo "BUILD FAILED"; exit 1; } + + echo "=== Obraz zbudowany, sprawdzam ===" + docker images | grep "$(cat /tmp/tag.txt | sed 's|git.modwad.pl/||')" || echo "Obraz nie znaleziony w docker images" + echo "=== Pushing SHA tag ===" - docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" - + docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" || { echo "PUSH SHA FAILED"; exit 1; } + echo "=== Pushing latest tag ===" - docker push "$(cat /tmp/tag.txt):latest" - + docker push "$(cat /tmp/tag.txt):latest" || { echo "PUSH LATEST FAILED"; exit 1; } + echo "=== SUCCESS: $(cat /tmp/tag.txt) ===" - + rm -f "Dockerfile.temp" "Dockerfile.final" done echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" depends_on: [select-projects-for-container] - - deploy-linux-local: - image: alpine:latest - commands: - - | - cd "${CI_WORKSPACE}" - - if [ ! -s changed-projects.txt ]; then - echo "Brak zmienionych projektow – pomijam deploy-linux-local." - exit 0 - fi - - echo "=== Sprawdzanie aplikacji LinuxLocal ===" - if [ ! -d "./linux-apps" ]; then - 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 *; do - echo "→ DEBUG: Sprawdzam $app" - - if [ ! -d "$app" ]; then - echo " → $app nie jest folderem, pomijam" - continue - fi - - echo " → Kopiuję $app" - echo " → Zawartość:" - 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/ - depends_on: [publish-linux-local, containerize-apps] - cleanup-docker: image: docker:27-cli commands: - | - echo "=== Status przed czyszczeniem ===" - docker system df - - echo "" - echo "=== Usuwanie dangling images ===" - docker image prune -f - - echo "" - echo "=== Usuwanie starych wersji aplikacji ===" - docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do - echo "Usuwam: $img" - docker rmi "$img" || true - done - - echo "" - echo "=== Usuwanie kontenerów ===" + echo "=== Czyszczenie starych obrazów ===" + docker image prune -af --filter "until=24h" + echo "=== Czyszczenie nieużywanych kontenerów ===" docker container prune -f - - echo "" - echo "=== Usuwanie build cache ===" - docker builder prune -af - - echo "" + echo "=== Czyszczenie build cache ===" + docker builder prune -af --filter "until=24h" echo "=== Status po czyszczeniu ===" docker system df - depends_on: [deploy-linux-local] + depends_on: [containerize-apps] when: status: [success, failure] diff --git a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs index 2dc9044..b2711c8 100644 --- a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs +++ b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs @@ -918,7 +918,6 @@ namespace SytelineSaAppEfDataModel .HasMaxLength(500) .IsRequired(false); - // Relationship entity.HasOne(e => e.Client) .WithMany() .HasForeignKey(e => e.FK_Client)