diff --git a/.woodpecker.yml b/.woodpecker.yml index 2b5c959..3ba5af3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -17,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 "{}" \; @@ -27,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" @@ -38,8 +38,32 @@ steps: commands: - | set -euf - CODE_DIR="/woodpecker/src/srv51.mikr.us/git/FA/FA_WEB" + 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) + + 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 @@ -48,7 +72,11 @@ 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 \ + -o "./nupkg" \ + /p:PackageVersion=$MINVER_VERSION else PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME – brak (nie jest to biblioteka NuGet)" @@ -66,7 +94,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 ===" @@ -92,7 +120,7 @@ steps: echo "→ Push $(basename "$pkg")" dotnet nuget push "$pkg" \ --source "BaGet" \ - --api-key "hfsa853nc9vfap53285ybndfahi58325hie242dsafa954" \ + --api-key "$BAGETTER_API_KEY" \ --skip-duplicate done @@ -101,13 +129,13 @@ 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 - CODE_DIR="/woodpecker/src/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 "{}" \;