Added more debugging

.gitea/workflows/build dev.yaml

@@ -33,15 +33,15 @@ jobs:
 
       - name: Build single file executables
         run: |
-          cd sh.actions/sh.actions.package-cleanup
+          cd sh.actions.package-cleanup
 
           # Build for Linux x64
-          dotnet publish -c Release -r linux-x64 -p:Version=$(cat ../../version.txt) -o publish/linux-x64
+          dotnet publish -c Release -r linux-x64 -p:Version=$(cat ../version.txt) -o publish/linux-x64
 
       - name: Upload to Gitea Generic Package Registry
         run: |
-          cd sh.actions/sh.actions.package-cleanup
+          cd sh.actions.package-cleanup
           curl -X PUT \
             -H "Authorization: token ${{ secrets.CI_ACCESS_TOKEN }}" \
             -T publish/linux-x64/sh.actions.package-cleanup \
-            "https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$(cat ../../version.txt)/package-cleanup-linux-x64"
+            "https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$(cat ../version.txt)/package-cleanup-linux-x64"

.gitignore

@@ -3,6 +3,7 @@
 
 bin/
 obj/
+publish/
 
 # Environment Variables - DO NOT COMMIT
 .env

package-cleanup/action.yaml

@@ -23,21 +23,19 @@ inputs:
     required: false
     default: "false"
 
-outputs:
-  deleted_packages:
-    description: "Number of packages deleted"
-    value: ${{ steps.cleanup.outputs.deleted_packages }}
-  processed_names:
-    description: "Number of package names processed"
-    value: ${{ steps.cleanup.outputs.processed_names }}
-
 runs:
   using: "composite"
   steps:
     - name: Download and test package-cleanup tool
       shell: bash
       run: |
-        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/package-cleanup-linux-x64
+        latest_path=$(curl -sI https://git.sh-edraft.de/sh-edraft.de/-/packages/generic/package-cleanup/ \
+          | awk -F ' ' '/Location:/ {print $2}' \
+          | tr -d '\r')
+
+        version=$(basename "$latest_path")
+        echo "Downloading package-cleanup version $version..."
+        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$version/package-cleanup-linux-x64
 
         # Make executable
         chmod +x package-cleanup-linux-x64
@@ -55,3 +53,4 @@ runs:
         GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
       run: |
         ./package-cleanup-linux-x64
+

sh.actions.package-cleanup/Program.cs

@@ -3,6 +3,13 @@ using sh.actions.package_cleanup.Service;
 
 var builder = Host.CreateApplicationBuilder(args);
 
+// Check for --dry-run argument
+var isDryRun = args.Contains("--dry-run");
+if (isDryRun)
+{
+    Environment.SetEnvironmentVariable("DRY_RUN", "true");
+}
+
 builder.Configuration
     .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
     .AddJsonFile("appsettings.local.json", optional: true, reloadOnChange: true)
@@ -15,5 +22,9 @@ builder.Services
     .AddHostedService<Worker>()
     .AddHttpClient<IGiteaPackageService, GiteaPackageService>();
 
+builder.Logging.ClearProviders();
+builder.Logging.AddConsole();
+builder.Logging.SetMinimumLevel(LogLevel.Debug);
+
 var host = builder.Build();
 await host.RunAsync();

sh.actions.package-cleanup/Worker.cs

@@ -11,22 +11,21 @@ public class Worker(
     IGiteaPackageService giteaPackageService
 ) : BackgroundService
 {
-    private async Task<int> DeletePackages(List<GiteaPackage> packages, CancellationToken cancellationToken = default)
+    private async Task DeletePackages(List<GiteaPackage> packages, CancellationToken cancellationToken = default)
     {
         var dryRun = configuration["DRY_RUN"]?.ToLower() == "true";
         if (dryRun)
         {
             logger.LogInformation("Dry run enabled, not deleting {Count} packages", packages.Count);
-            return 0;
+            logger.LogInformation("Would delete packages: {versions}",
+                string.Join(", ", packages.Select(p => p.Version)));
         }
 
-        var deletedCount = 0;
         foreach (var giteaPackage in packages)
         {
             try
             {
                 await giteaPackageService.DeletePackage(giteaPackage, cancellationToken);
-                deletedCount++;
             }
             catch (Exception ex)
             {
@@ -34,33 +33,18 @@ public class Worker(
                     giteaPackage.Name, giteaPackage.Version);
             }
         }
-        return deletedCount;
-    }
-
-    private void WriteGitHubOutput(string name, string value)
-    {
-        var githubOutput = configuration["GITHUB_OUTPUT"];
-        if (string.IsNullOrEmpty(githubOutput))
-        {
-            logger.LogDebug("GITHUB_OUTPUT not set, skipping output: {Name}={Value}", name, value);
-            return;
-        }
-
-        try
-        {
-            File.AppendAllText(githubOutput, $"{name}={value}{Environment.NewLine}");
-            logger.LogInformation("Wrote to GITHUB_OUTPUT: {Name}={Value}", name, value);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex, "Failed to write to GITHUB_OUTPUT file");
-        }
     }
 
     protected override async Task ExecuteAsync(CancellationToken cancellationToken)
     {
         try
         {
+            var dryRun = configuration["DRY_RUN"]?.ToLower() == "true";
+            if (dryRun)
+            {
+                logger.LogInformation("DRY RUN MODE ENABLED - No packages will be deleted");
+            }
+
             // Parse comma-separated names
             var names = (configuration["NAMES"] ?? "")
                 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
@@ -68,14 +52,10 @@ public class Worker(
             if (names.Length == 0)
             {
                 logger.LogWarning("No package names configured");
-                WriteGitHubOutput("deleted_packages", "0");
-                WriteGitHubOutput("processed_names", "0");
                 appLifetime.StopApplication();
                 return;
             }
 
-            var totalDeleted = 0;
-
             // Process each name separately: collect -> filter -> delete
             foreach (var name in names)
             {
@@ -85,26 +65,20 @@ public class Worker(
                 logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name);
 
                 var packagesToDelete = packageService.FilterPackagesToDelete(packages);
-                logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count, name);
+                logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count,
+                    name);
 
-                var deletedCount = await DeletePackages(packagesToDelete, cancellationToken);
+                await DeletePackages(packagesToDelete, cancellationToken);
-                totalDeleted += deletedCount;
+                logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
-                logger.LogInformation("Deleted {Count} packages for name '{Name}'", deletedCount, name);
 
                 logger.LogInformation("Cleanup finished for name '{Name}'", name);
             }
 
             logger.LogInformation("All package names processed successfully");
-            
-            // Write outputs to GITHUB_OUTPUT
-            WriteGitHubOutput("deleted_packages", totalDeleted.ToString());
-            WriteGitHubOutput("processed_names", names.Length.ToString());
         }
         catch (Exception ex)
         {
             logger.LogError(ex, "Cleanup failed with an error");
-            WriteGitHubOutput("deleted_packages", "0");
-            WriteGitHubOutput("processed_names", "0");
         }
         finally
         {

sh.actions.package-cleanup/sh.actions.package-cleanup.csproj

@@ -6,10 +6,41 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>dotnet-sh.actions.package_cleanup-2b7a013f-ec22-4325-9832-0c9ca9b8ced9</UserSecretsId>
         <RootNamespace>sh.actions.package_cleanup</RootNamespace>
+        <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>true</SelfContained>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
     </ItemGroup>
+
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+    </ItemGroup>
 </Project>

sh.actions.sln.DotSettings.user

@@ -1,7 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpResponseMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff7cd24f648c14c59ab25c6dcf9108aef198e00_003Fd7_003F31923dff_003FHttpResponseMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AServiceProvider_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fd7e2ce30531b7a2d56142411c5e51c3d516aafcb44e7628167b959660a65c_003FServiceProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=fc220b10_002D634c_002D48e4_002Da543_002Df5162d99c787/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
-  &lt;Solution /&gt;
-&lt;/SessionState&gt;</s:String>
-	</wpf:ResourceDictionary>