diff --git a/.gitea/workflows/kub-deploy.yml b/.gitea/workflows/kub-deploy.yml index 822b85b..df62926 100644 --- a/.gitea/workflows/kub-deploy.yml +++ b/.gitea/workflows/kub-deploy.yml @@ -26,6 +26,8 @@ jobs: git log -1 --format="%H %s" - name: Pack and Push Protobuf packages + env: + CI: "true" run: | echo "📦 Looking for Protobuf projects..." @@ -49,14 +51,19 @@ jobs: # Get project directory proj_dir=$(dirname "$proj") - # Build and pack + # Restore first + echo " → Restoring..." + dotnet restore "$proj" + + # Build echo " → Building..." - dotnet build "$proj" -c Release --no-restore 2>/dev/null || dotnet restore "$proj" && dotnet build "$proj" -c Release + dotnet build "$proj" -c Release --no-restore + # Pack without running PushToFoursatNuget target echo " → Packing..." - dotnet pack "$proj" -c Release --no-build -o "$proj_dir/nupkg" + dotnet pack "$proj" -c Release --no-build -o "$proj_dir/nupkg" -p:RunPushTarget=false - # Push to Nexus (skip-duplicate will ignore if already exists) + # Push to Nexus manually (skip-duplicate will ignore if already exists) echo " → Pushing to Nexus..." for nupkg in $proj_dir/nupkg/*.nupkg; do if [ -f "$nupkg" ]; then @@ -64,8 +71,7 @@ jobs: --source "${{ env.NEXUS_URL }}" \ --api-key "${{ env.NEXUS_USER }}:${{ env.NEXUS_PASS }}" \ --skip-duplicate \ - --allow-insecure-connections || echo " ⚠️ Package may already exist" - echo " ✅ Done: $(basename $nupkg)" + --allow-insecure-connections && echo " ✅ Pushed: $(basename $nupkg)" || echo " ⏭️ Skipped (exists)" fi done echo "" diff --git a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj index 7a2e238..e15aeb9 100644 --- a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj +++ b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj @@ -63,10 +63,10 @@ - + $(PackageOutputPath)$(PackageId).$(Version).nupkg - dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate + dotnet nuget push **/*.nupkg --source http://194.5.195.53:32081/repository/foursat-nuget-hosted/index.json --api-key admin:87zH26nbqT --skip-duplicate --allow-insecure-connections