From 4f40f336661831c15c85155779b7eeae394e514e Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 21:39:26 +0100 Subject: [PATCH 01/37] * Bring back change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index da80dc5..630102f 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap(); + CreateMap().ReverseMap(); } } } From dae2a08390ee8ff388ef9fafca8207c2278e9470 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 21:56:42 +0100 Subject: [PATCH 02/37] * Test change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index 630102f..da80dc5 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap(); } } } From 3c62579a49f285e400cd35be9f851981a81a32f8 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:37:04 +0000 Subject: [PATCH 03/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2b5c959..bd67f67 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -92,7 +92,7 @@ steps: echo "→ Push $(basename "$pkg")" dotnet nuget push "$pkg" \ --source "BaGet" \ - --api-key "hfsa853nc9vfap53285ybndfahi58325hie242dsafa954" \ + --api-key "$BAGETTER_API_KEY" \ --skip-duplicate done From 1f9ae3998cea5a66653d515d9c9800c5277af955 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:40:22 +0000 Subject: [PATCH 04/37] Update .woodpecker.yml --- .woodpecker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index bd67f67..b101e19 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -101,9 +101,9 @@ steps: build-and-publish-apps: image: mcr.microsoft.com/dotnet/sdk:latest - environment: - DEPLOY_SSH_KEY: - from_secret: deploy_ssh_key + # environment: + # DEPLOY_SSH_KEY: + # from_secret: deploy_ssh_key commands: - | set -euf From 5d64abace3ede42e66bac06b6d44347b255bc3fc Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:49:58 +0000 Subject: [PATCH 05/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b101e19..7c15816 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,7 +8,7 @@ steps: clone-manual: image: woodpeckerci/plugin-git settings: - remote: http://gitea:3000/FA/FA_WEB.git + remote: http://172.0.0.1:3000/FA/FA_WEB.git branch: master depth: 1 From 4368129802cfbb18a5d4f72d0cc4334af5d2bf9f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:51:10 +0000 Subject: [PATCH 06/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7c15816..74f569d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,7 +8,7 @@ steps: clone-manual: image: woodpeckerci/plugin-git settings: - remote: http://172.0.0.1:3000/FA/FA_WEB.git + remote: http://127.0.0.1:3000/FA/FA_WEB.git branch: master depth: 1 From eb8dc3cd4f7d5d8f60da6503a7371c66177e7584 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:51:37 +0000 Subject: [PATCH 07/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 74f569d..b101e19 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,7 +8,7 @@ steps: clone-manual: image: woodpeckerci/plugin-git settings: - remote: http://127.0.0.1:3000/FA/FA_WEB.git + remote: http://gitea:3000/FA/FA_WEB.git branch: master depth: 1 From 913a1ce49df63cbf61e1bc561065f48ce467c6c7 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:53:08 +0000 Subject: [PATCH 08/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b101e19..74f569d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,7 +8,7 @@ steps: clone-manual: image: woodpeckerci/plugin-git settings: - remote: http://gitea:3000/FA/FA_WEB.git + remote: http://127.0.0.1:3000/FA/FA_WEB.git branch: master depth: 1 From 2b3bc030493796fb1d9a02cfb20da11949cd3278 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 12:59:32 +0000 Subject: [PATCH 09/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 74f569d..b101e19 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,7 +8,7 @@ steps: clone-manual: image: woodpeckerci/plugin-git settings: - remote: http://127.0.0.1:3000/FA/FA_WEB.git + remote: http://gitea:3000/FA/FA_WEB.git branch: master depth: 1 From f0c4fef3cb84dbf792f316c7055b8d720fd92254 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 13:04:29 +0000 Subject: [PATCH 10/37] Update .woodpecker.yml --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index b101e19..5d8df6d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,6 +5,17 @@ when: branch: [master] steps: + debug-workspace: + image: alpine:latest + commands: + - echo "=== Aktualny katalog roboczy (pwd) ===" + - pwd + - echo "=== Zawartość /woodpecker/src ===" + - ls -la /woodpecker/src + - echo "=== Pełna struktura src (do głębokości 4) ===" + - find /woodpecker/src -type d -maxdepth 4 | sort + - echo "=== Szukam katalogu z kodem (.git lub .csproj) ===" + - find /woodpecker -name ".git" -o -name "*.csproj" | head -20 clone-manual: image: woodpeckerci/plugin-git settings: From 2c196c68d76e8be7759cde7849a245138d9fc497 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 13:05:39 +0000 Subject: [PATCH 11/37] Update .woodpecker.yml --- .woodpecker.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5d8df6d..c616d2c 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,17 +5,6 @@ when: branch: [master] steps: - debug-workspace: - image: alpine:latest - commands: - - echo "=== Aktualny katalog roboczy (pwd) ===" - - pwd - - echo "=== Zawartość /woodpecker/src ===" - - ls -la /woodpecker/src - - echo "=== Pełna struktura src (do głębokości 4) ===" - - find /woodpecker/src -type d -maxdepth 4 | sort - - echo "=== Szukam katalogu z kodem (.git lub .csproj) ===" - - find /woodpecker -name ".git" -o -name "*.csproj" | head -20 clone-manual: image: woodpeckerci/plugin-git settings: @@ -28,7 +17,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/srv51.mikr.us/git/FA/FA_WEB" + CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" cd "$CODE_DIR" echo "=== Restore wszystkich projektów ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; @@ -38,7 +27,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/srv51.mikr.us/git/FA/FA_WEB" + CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" cd "$CODE_DIR" echo "=== Uruchamianie testów ===" dotnet test --no-restore --configuration Release --logger "trx" @@ -49,7 +38,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/srv51.mikr.us/git/FA/FA_WEB" + CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" cd "$CODE_DIR" echo "=== Diagnostyka projektów ===" find . -name "*.csproj" -type f | sort @@ -77,7 +66,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/srv51.mikr.us/git/FA/FA_WEB" + CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" cd "$CODE_DIR" echo "=== Test połączenia z BaGetter ===" From 49f685f10948fcf01efad62a2fe93898792e84c6 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 16:10:24 +0000 Subject: [PATCH 12/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c616d2c..e119760 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -107,7 +107,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/srv51.mikr.us/git/FA/FA_WEB" + CODE_DIR="/woodpecker/src/localhost/srv51.mikr.us/git/FA/FA_WEB" cd "$CODE_DIR" echo "=== Ponowny restore aplikacji (z najnowszymi pakietami z BaGetter) ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; From 1f3a29b293ce5fd1b8e4c52a78c9c56f0f9df2c7 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 16:16:52 +0000 Subject: [PATCH 13/37] Update .woodpecker.yml --- .woodpecker.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index e119760..2892e85 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -38,8 +38,17 @@ steps: commands: - | set -euf + echo "=== Instalacja MinVer CLI ===" + dotnet tool install --tool-path /tmp/minver minver-cli CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" cd "$CODE_DIR" + + echo "=== Obliczona wersja przez MinVer ===" + MINVER_VERSION=$(/tmp/minver/minver -m 2 -t 2.0 -d alpha) # dopasuj opcje + echo "Wersja: $MINVER_VERSION" + + mkdir -p nupkg + echo "=== Diagnostyka projektów ===" find . -name "*.csproj" -type f | sort mkdir -p nupkg From 96bfccdd55b07f765b8f8442d883f5e6dccd842d Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 16:24:44 +0000 Subject: [PATCH 14/37] Update .woodpecker.yml --- .woodpecker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2892e85..dffac05 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -57,7 +57,12 @@ steps: if grep -q '' "$csproj"; then PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pakuję $PROJECT_NAME ($csproj)" - dotnet pack "$csproj" --configuration Release -o "$CODE_DIR/nupkg" + #dotnet pack "$csproj" --configuration Release -o "$CODE_DIR/nupkg" /p:PackageVersion=$MINVER_VERSION + dotnet pack "$csproj" \ + --configuration Release \ + --no-restore \ + -o "./nupkg" \ + /p:PackageVersion=$MINVER_VERSION else PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME – brak (nie jest to biblioteka NuGet)" From a49efec31376692d358008fe375fc05e57fadec6 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 16:25:23 +0000 Subject: [PATCH 15/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index dffac05..ae05d24 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -121,7 +121,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/localhost/srv51.mikr.us/git/FA/FA_WEB" + CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" cd "$CODE_DIR" echo "=== Ponowny restore aplikacji (z najnowszymi pakietami z BaGetter) ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; From 0baee2be8b3762e3e427eff4be8fd12f7ffddfb3 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 16:27:31 +0000 Subject: [PATCH 16/37] Update .woodpecker.yml --- .woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ae05d24..67b2fec 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -60,7 +60,6 @@ steps: #dotnet pack "$csproj" --configuration Release -o "$CODE_DIR/nupkg" /p:PackageVersion=$MINVER_VERSION dotnet pack "$csproj" \ --configuration Release \ - --no-restore \ -o "./nupkg" \ /p:PackageVersion=$MINVER_VERSION else From 03b28eed6e96f93fb71a021d971d69634b56e99c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 20:23:50 +0000 Subject: [PATCH 17/37] Update .woodpecker.yml --- .woodpecker.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 67b2fec..c60da31 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -49,6 +49,16 @@ steps: mkdir -p nupkg + echo "=== Pełniejsze fetch git (unshallow + tags) ===" + git fetch --prune --unshallow || echo "Już full clone – OK" + git fetch --tags + + # Diagnostyka – sprawdź czy tag jest widoczny + echo "=== Dostępne tagi ===" + git tag -l + echo "=== Aktualny commit i opis ===" + git describe --tags --always --dirty + echo "=== Diagnostyka projektów ===" find . -name "*.csproj" -type f | sort mkdir -p nupkg From 26d00213d2a214231b516924e4ab888ddf57aa28 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 20:25:53 +0000 Subject: [PATCH 18/37] Update .woodpecker.yml --- .woodpecker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c60da31..35115b3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -44,7 +44,12 @@ steps: cd "$CODE_DIR" echo "=== Obliczona wersja przez MinVer ===" - MINVER_VERSION=$(/tmp/minver/minver -m 2 -t 2.0 -d alpha) # dopasuj opcje + MINVER_VERSION=$(/tmp/minver/minver \ + --auto-increment patch \ + --minimum-major-minor 2.0 \ + --default-pre-release-identifiers alpha.0 \ + --verbosity normal) + echo "Wersja: $MINVER_VERSION" mkdir -p nupkg From 1e796e2c13b289e0133fb201d2f8c51ea0c945a2 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 8 Jan 2026 20:30:39 +0000 Subject: [PATCH 19/37] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 35115b3..3ba5af3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -48,7 +48,7 @@ steps: --auto-increment patch \ --minimum-major-minor 2.0 \ --default-pre-release-identifiers alpha.0 \ - --verbosity normal) + --verbosity info) echo "Wersja: $MINVER_VERSION" From c4a99e3c356c2528e747c2ee9023d540c280c1ae Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 22:08:44 +0100 Subject: [PATCH 20/37] * Test change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index 630102f..da80dc5 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap(); } } } From 6f9b94a97cced66cca87602dd06a45972d155393 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 22:14:30 +0100 Subject: [PATCH 21/37] * Bring back change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index da80dc5..630102f 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap(); + CreateMap().ReverseMap(); } } } From db03b35292afbcd2fed0b07009f045f84492a774 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 22:23:14 +0100 Subject: [PATCH 22/37] * Another test --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index 630102f..da80dc5 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap(); } } } From d832f1b9607b75119125798961417d0d6ce056e7 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 22:26:16 +0100 Subject: [PATCH 23/37] * Another change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index da80dc5..630102f 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap(); + CreateMap().ReverseMap(); } } } From 070b538cb26973a73a9838fd949b67b85af8ed8e Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 22:31:11 +0100 Subject: [PATCH 24/37] * Another change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index 630102f..da80dc5 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap(); } } } From 38ff2c167377829696a00d63f9450b55ec21c4c0 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 8 Jan 2026 22:40:27 +0100 Subject: [PATCH 25/37] * Test change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index da80dc5..630102f 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap(); + CreateMap().ReverseMap(); } } } From 1321c88a31aa16ca92e9a0602b69facbc002f579 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 12:03:19 +0100 Subject: [PATCH 26/37] * Test change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index 630102f..da80dc5 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap(); } } } From 6fed42ee646429c3b7fbac9d22ff0eae8bf7d3b0 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 12:16:26 +0100 Subject: [PATCH 27/37] * Test change --- SytelineSaAppEfDataModel/MappingProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index da80dc5..630102f 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap(); + CreateMap().ReverseMap(); } } } From 2c97c5054e86f09ca3af28c7dc6c908ecb6d316c Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 12:50:12 +0100 Subject: [PATCH 28/37] Add Gitea Actions workflow for build & publish --- .gitea/workflows/build-and-publish.yml | 188 +++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 .gitea/workflows/build-and-publish.yml diff --git a/.gitea/workflows/build-and-publish.yml b/.gitea/workflows/build-and-publish.yml new file mode 100644 index 0000000..d97cba3 --- /dev/null +++ b/.gitea/workflows/build-and-publish.yml @@ -0,0 +1,188 @@ +name: Build, Test & Publish DataModels + Apps + +on: + push: + branches: + - master + create: # nowe tagi + tags: + - 'v*' + pull_request: + types: [opened, synchronize, reopened, closed] + workflow_dispatch: # ręczne uruchomienie + +jobs: + restore-and-test: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 # potrzebne do MinVer i git describe + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '8.0.x' # zmień na swoją wersję jeśli inna + + - name: Restore all projects + run: | + echo "=== Restore wszystkich projektów ===" + find . -name "*.csproj" -type f -exec dotnet restore "{}" \; + + - name: Run tests + run: | + echo "=== Uruchamianie testów ===" + dotnet test --no-restore --configuration Release --logger "trx" + + pack-datamodels: + runs-on: ubuntu-latest + needs: restore-and-test + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: '8.0.x' + + - name: Install MinVer CLI + run: dotnet tool install --global minver-cli + + - name: Pack DataModel projects + env: + MINVER_AUTO_INCREMENT: patch + MINVER_MINIMUM_MAJOR_MINOR: 2.0 + MINVER_DEFAULT_PRE_RELEASE_IDENTIFIERS: alpha.0 + run: | + echo "=== Obliczona wersja przez MinVer ===" + MINVER_VERSION=$(minver --verbosity detailed) + echo "Wersja: $MINVER_VERSION" + + mkdir -p nupkg + + echo "=== Pełniejsze fetch git (tags) ===" + git fetch --prune --tags --force + + echo "=== Dostępne tagi ===" + git tag -l + + echo "=== Aktualny opis commitu ===" + git describe --tags --always --dirty || echo "Brak tagów" + + echo "=== Pakowanie projektów z PackageId ===" + find . -name "*.csproj" -type f | while read -r csproj; do + if grep -q '' "$csproj"; then + PROJECT_NAME=$(basename "$csproj" .csproj) + echo "→ Pakuję $PROJECT_NAME" + dotnet pack "$csproj" \ + --no-restore \ + --configuration Release \ + -o "./nupkg" \ + /p:PackageVersion="$MINVER_VERSION" + else + echo "→ Pomijam $(basename "$csproj" .csproj) – brak PackageId" + fi + done + + ls -la nupkg/ || echo "Brak wygenerowanych pakietów" + + - name: Upload NuGet packages as artifact + uses: actions/upload-artifact@v4 + with: + name: nuget-packages + path: nupkg/*.nupkg + retention-days: 3 + + publish-to-baget: + runs-on: ubuntu-latest + needs: pack-datamodels + steps: + - uses: actions/checkout@v4 # potrzebne tylko jeśli chcesz logować coś z repo + + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: '8.0.x' + + - name: Download built packages + uses: actions/download-artifact@v4 + with: + name: nuget-packages + path: nupkg/ + + - name: Create custom NuGet.config (allow HTTP) + run: | + cat > NuGet.Config < + + + + + + + + EOF + + - name: Publish packages to BaGet + env: + BAGET_API_KEY: ${{ secrets.BAGET_API_KEY }} + run: | + echo "=== Publikacja do BaGet ===" + find nupkg -name "*.nupkg" -type f | while read -r pkg; do + echo "→ Push $(basename "$pkg")" + dotnet nuget push "$pkg" \ + --source "BaGet" \ + --api-key "$BAGET_API_KEY" \ + --skip-duplicate + done + + build-and-publish-apps: + runs-on: ubuntu-latest + needs: publish-to-baget + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: '8.0.x' + + - name: Restore (with latest DataModels) + run: | + echo "=== Restore z najnowszymi pakietami z BaGet ===" + dotnet restore + + - name: Publish selected applications + run: | + echo "=== Publish aplikacji z DeployToCentral ===" + find . -name "*.csproj" -type f | while read -r csproj; do + PROJECT_NAME=$(basename "$csproj" .csproj) + PROJECT_DIR=$(dirname "$csproj") + + if [[ "$PROJECT_NAME" == *"Api"* ]] || [[ "$PROJECT_NAME" == *"Blazor"* ]] || \ + [[ "$PROJECT_DIR" == *"/Api/"* ]] || [[ "$PROJECT_DIR" == *"/Blazor/"* ]]; then + + DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -nologo 2>/dev/null || echo "false") + + if [ "$DEPLOY_TO_CENTRAL" != "true" ]; then + echo "Pomijam $PROJECT_NAME (DeployToCentral ≠ true)" + continue + fi + + echo "→ Publishing $PROJECT_NAME" + dotnet publish "$csproj" \ + --no-restore \ + --configuration Release \ + -o "./publish-$PROJECT_NAME" + + # Tutaj możesz dodać deployment (np. rsync, scp, docker build+push itp.) + # Przykład (zakomentowany): + # rsync -avz --delete ./publish-$PROJECT_NAME/ user@server:/path/to/app/ + else + echo "Pomijam $PROJECT_NAME (nie Api/Blazor)" + fi + done + + echo "Pipeline zakończony" From 14b83bf9d2539ddefc4f6f591b8990f4a645b53a Mon Sep 17 00:00:00 2001 From: trent Date: Fri, 9 Jan 2026 12:01:48 +0000 Subject: [PATCH 29/37] Update .gitea/workflows/build-and-publish.yml --- .gitea/workflows/build-and-publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/build-and-publish.yml b/.gitea/workflows/build-and-publish.yml index d97cba3..0ebad99 100644 --- a/.gitea/workflows/build-and-publish.yml +++ b/.gitea/workflows/build-and-publish.yml @@ -19,6 +19,10 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 # potrzebne do MinVer i git describe + repository: FA/FA_WEB # ← nazwa repozytorium (organizacja/repo) + ref: ${{ github.ref }} # lub ${{ gitea.ref }} – w Gitea obie działają + # Najważniejsze – nadpisz domyślny URL + url: http://srv51.mikr.us:20120/git/FA/FA_WEB.git - name: Setup .NET uses: actions/setup-dotnet@v4 From 6297ae92eb98ea531c20aacdd4a2a20e75c895ab Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 22:30:41 +0100 Subject: [PATCH 30/37] test webhook From 1e7c6a6694903a67a9102622f06d7e4313951caf Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 22:37:45 +0100 Subject: [PATCH 31/37] test webhook From 929e41e312c38a2c9b26bb9a971ec55ec1479563 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 22:44:47 +0100 Subject: [PATCH 32/37] test webhook From 2f80dbc13cc2aaa19494e4f8f119d3d5d8b77412 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 9 Jan 2026 22:49:35 +0100 Subject: [PATCH 33/37] test webhook From a26a52b078fe7724336c5c513bffbcd6f73250fa Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Sat, 10 Jan 2026 21:39:37 +0100 Subject: [PATCH 34/37] force pipeline detection - dodanie cache buster w .woodpecker.yml --- .woodpecker.yml | 64 +++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3ba5af3..f7292a8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,10 +1,16 @@ skip_clone: true -when: - event: [push, tag, manual] - branch: [master] +wwhen: + event: push + branch: master steps: + debug-location: + image: alpine + commands: + - pwd # gdzie aktualnie jesteśmy + - ls -la # co jest w bieżącym katalogu + - find /woodpecker -maxdepth 4 -type d 2>/dev/null clone-manual: image: woodpeckerci/plugin-git settings: @@ -17,8 +23,8 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" - cd "$CODE_DIR" + cd "${CI_WORKSPACE}" + echo "Aktualna ścieżka: $(pwd)" echo "=== Restore wszystkich projektów ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; @@ -27,8 +33,7 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" - cd "$CODE_DIR" + cd "${CI_WORKSPACE}" echo "=== Uruchamianie testów ===" dotnet test --no-restore --configuration Release --logger "trx" depends_on: [restore] @@ -38,32 +43,28 @@ steps: commands: - | set -euf + cd "${CI_WORKSPACE}" echo "=== Instalacja MinVer CLI ===" dotnet tool install --tool-path /tmp/minver minver-cli - CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" - cd "$CODE_DIR" - echo "=== Obliczona wersja przez MinVer ===" MINVER_VERSION=$(/tmp/minver/minver \ - --auto-increment patch \ - --minimum-major-minor 2.0 \ - --default-pre-release-identifiers alpha.0 \ - --verbosity info) - + --auto-increment patch \ + --minimum-major-minor 2.0 \ + --default-pre-release-identifiers alpha.0 \ + --verbosity info) + echo "Wersja: $MINVER_VERSION" - + mkdir -p nupkg - echo "=== Pełniejsze fetch git (unshallow + tags) ===" git fetch --prune --unshallow || echo "Już full clone – OK" git fetch --tags - + # Diagnostyka – sprawdź czy tag jest widoczny echo "=== Dostępne tagi ===" git tag -l echo "=== Aktualny commit i opis ===" git describe --tags --always --dirty - echo "=== Diagnostyka projektów ===" find . -name "*.csproj" -type f | sort mkdir -p nupkg @@ -72,11 +73,10 @@ steps: if grep -q '' "$csproj"; then PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pakuję $PROJECT_NAME ($csproj)" - #dotnet pack "$csproj" --configuration Release -o "$CODE_DIR/nupkg" /p:PackageVersion=$MINVER_VERSION dotnet pack "$csproj" \ - --configuration Release \ - -o "./nupkg" \ - /p:PackageVersion=$MINVER_VERSION + --configuration Release \ + -o "./nupkg" \ + /p:PackageVersion=$MINVER_VERSION else PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME – brak (nie jest to biblioteka NuGet)" @@ -94,12 +94,9 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" - cd "$CODE_DIR" - + cd "${CI_WORKSPACE}" echo "=== Test połączenia z BaGetter ===" curl -f http://baget:80/v3/index.json || echo "Nie można połączyć się z BaGetter!" - # Tworzymy minimalny NuGet.Config tylko po to, żeby odblokować HTTP dla nazwanego źródła cat < NuGet.Config @@ -111,10 +108,8 @@ steps: EOF - echo "=== Użyty NuGet.Config (tylko do odblokowania HTTP) ===" cat NuGet.Config - echo "=== Publikacja pakietów do BaGetter ===" find ./nupkg -name "*.nupkg" -type f | while read pkg; do echo "→ Push $(basename "$pkg")" @@ -123,20 +118,15 @@ steps: --api-key "$BAGETTER_API_KEY" \ --skip-duplicate done - echo "Wszystkie pakiety DataModel opublikowane w BaGetter!" depends_on: [pack-datamodels] build-and-publish-apps: image: mcr.microsoft.com/dotnet/sdk:latest - # environment: - # DEPLOY_SSH_KEY: - # from_secret: deploy_ssh_key commands: - | set -euf - CODE_DIR="/woodpecker/src/localhost/git/FA/FA_WEB" - cd "$CODE_DIR" + cd "${CI_WORKSPACE}" echo "=== Ponowny restore aplikacji (z najnowszymi pakietami z BaGetter) ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; echo "=== Publish aplikacji ===" @@ -150,7 +140,7 @@ steps: continue fi echo "→ Publish $PROJECT_NAME ($csproj)" - dotnet publish "$csproj" --no-restore -c Release -o "$CODE_DIR/publish-$PROJECT_NAME" + dotnet publish "$csproj" --no-restore -c Release -o "./publish-$PROJECT_NAME" # ←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←← # Tu wstaw swój kod deployu (rsync/ssh itp.) # ←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←← @@ -159,4 +149,4 @@ steps: fi done echo "Pipeline zakończony pomyślnie!" - depends_on: [publish-datamodels-to-baget] \ No newline at end of file + depends_on: [publish-datamodels-to-baget] From 7d37b7744c770268a39ade6f2a9f962f7ab285ba Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Sat, 10 Jan 2026 21:53:08 +0100 Subject: [PATCH 35/37] * Added missing info to OrderManagementDataModel.csproj --- OrdersManagementDataModel/OrdersManagementDataModel.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OrdersManagementDataModel/OrdersManagementDataModel.csproj b/OrdersManagementDataModel/OrdersManagementDataModel.csproj index a159008..f9865e2 100644 --- a/OrdersManagementDataModel/OrdersManagementDataModel.csproj +++ b/OrdersManagementDataModel/OrdersManagementDataModel.csproj @@ -5,6 +5,12 @@ DataModel enable enable + + OrdersManagementDataModel + Piotr Kus + OrdersManagement Entity Framework Data Model + patch + 1.0 From 51a96f6c6af73e75cf8f5da5183688c1b976dc19 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Sat, 10 Jan 2026 21:59:06 +0100 Subject: [PATCH 36/37] Change .woodpecker.yml --- .woodpecker.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f7292a8..452eed2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,7 +1,9 @@ skip_clone: true -wwhen: - event: push +when: + event: pull_request + action: + - merge branch: master steps: From 8e9a2a0975bcad923a3ddd2a2b73a99109485f4c Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Sat, 10 Jan 2026 22:06:04 +0100 Subject: [PATCH 37/37] * Added removing generating package on build --- FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj | 1 + OrdersManagementDataModel/OrdersManagementDataModel.csproj | 1 + SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj | 1 + 3 files changed, 3 insertions(+) diff --git a/FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj b/FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj index ab4a415..d3a217e 100644 --- a/FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj +++ b/FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj @@ -10,6 +10,7 @@ enable patch 1.0 + false diff --git a/OrdersManagementDataModel/OrdersManagementDataModel.csproj b/OrdersManagementDataModel/OrdersManagementDataModel.csproj index f9865e2..3549603 100644 --- a/OrdersManagementDataModel/OrdersManagementDataModel.csproj +++ b/OrdersManagementDataModel/OrdersManagementDataModel.csproj @@ -11,6 +11,7 @@ OrdersManagement Entity Framework Data Model patch 1.0 + false diff --git a/SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj b/SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj index 1e23ae8..becf56a 100644 --- a/SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj +++ b/SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj @@ -12,6 +12,7 @@ Syteline Entity Framework Data Model patch 1.0 + false