Merge pull request 'dev' (#1) from dev into master

Reviewed-on: #1

.gitea/workflows/build.yaml

@@ -0,0 +1,45 @@
+name: Build on push
+run-name: Build on push
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  prepare:
+    runs-on: [runner]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - uses: https://git.sh-edraft.de/sh-edraft.de/actions/set-version@master
+        env:
+          CI_ACCESS_TOKEN: ${{ secrets.CI_ACCESS_TOKEN }}
+
+  build:
+    runs-on: [runner]
+    needs: prepare
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Download build version artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: version
+
+      - name: Build single file executables
+        run: |
+          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
+
+      - name: Upload to Gitea Generic Package Registry
+        run: |
+          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"

package-cleanup/action.yaml

@@ -14,7 +14,7 @@ inputs:
   types:
     description: "Types of packages (e.g. Container, PyPi, NuGet)"
     required: false
-    default: "Container,PyPi,NuGet"
+    default: "container,pypi,nuget,npm"
   api_token:
     description: "API token for authentication"
     required: true
@@ -29,7 +29,13 @@ runs:
     - 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
@@ -46,7 +52,5 @@ runs:
         DRY_RUN: ${{ inputs.dry_run }}
         GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
       run: |
-        echo "Starting cleanup..."
         ./package-cleanup-linux-x64
-        echo "Cleanup completed."
+
-        rm package-cleanup-linux-x64

sh.actions.package-cleanup.Tests/Service/PackageServiceTests.cs

@@ -22,6 +22,29 @@ public class PackageFilterTests
         }).ToList();
     }
 
+    [Fact]
+    public void TestPackageNameParsing()
+    {
+        var inputString =
+            "@sh-edraft.de/core, sh-edraft.core.api, sh-edraft.core.api.auth, sh-edraft.core.api.configuration, sh-edraft.core.api.db, sh-edraft.core.api.graphql, sh-edraft.core.api.service, sh-edraft.core.utils";
+        List<string> expected = [
+            "@sh-edraft.de/core",
+            "sh-edraft.core.api",
+            "sh-edraft.core.api.auth",
+            "sh-edraft.core.api.configuration",
+            "sh-edraft.core.api.db",
+            "sh-edraft.core.api.graphql",
+            "sh-edraft.core.api.service",
+            "sh-edraft.core.utils"
+        ];
+        
+        var actual = inputString
+            .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        
+        Assert.Equal(expected.Count, actual.Length);
+        Assert.Equal(expected, actual);
+    }
+
     [Fact]
     public void TestFilterPackagesToDelete()
     {
@@ -102,7 +125,26 @@ public class PackageFilterTests
         "2024.8.10.0-exp",
         "2024.8.10.1-exp",
         "2024.8.11.0-exp",
-        "2024.8.11.2-exp"
+        "2024.8.11.2-exp",
+        "2026.2.21.27-dev",
+        "2026.2.21.26-dev",
+        "2026.2.21.25-dev",
+        "2026.2.21.24-dev",
+        "2026.2.21.23-dev",
+        "2026.2.21.22-dev",
+        "2026.2.21.21-dev",
+        "2026.2.21.20-dev",
+        "2026.2.21.19-dev",
+        "2026.2.21.18-dev",
+        "2026.2.21.17-dev",
+        "2026.2.21.15-dev",
+        "2026.2.21.14-dev",
+        "2026.2.21.13-dev",
+        "2026.2.21.12-dev",
+        "2026.2.21.11-dev",
+        "2026.2.21.10-dev",
+        "2026.2.21.9-dev",
+        "2026.2.21.8-dev",
     ];
 
     private readonly List<string> _versionsToHold =
@@ -139,7 +181,9 @@ public class PackageFilterTests
         "0.1.1-exp",
         "0.1.2-exp",
         "2024.8.11.0-exp",
-        "2024.8.11.2-exp"
+        "2024.8.11.2-exp",
+        "2026.2.21.27-dev",
+        "2026.2.21.26-dev",
     ];
 
     private List<string> _expectDeleted => _versions.Except(_versionsToHold).ToList();

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)
@@ -20,5 +27,4 @@ builder.Logging.AddConsole();
 builder.Logging.SetMinimumLevel(LogLevel.Debug);
 
 var host = builder.Build();
-Console.WriteLine("STARTING");
 await host.RunAsync();

sh.actions.package-cleanup/Worker.cs

@@ -17,6 +17,8 @@ public class Worker(
         if (dryRun)
         {
             logger.LogInformation("Dry run enabled, not deleting {Count} packages", packages.Count);
+            logger.LogInformation("Would delete packages: {versions}",
+                string.Join(", ", packages.Select(p => p.Version)));
         }
 
         foreach (var giteaPackage in packages)
@@ -37,6 +39,12 @@ public class Worker(
     {
         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);
@@ -48,8 +56,12 @@ public class Worker(
                 return;
             }
 
+            logger.LogInformation("Deleting {count} packages: {names}", names.Length, string.Join(", ", names));
+
             // Process each name separately: collect -> filter -> delete
             foreach (var name in names)
+            {
+                try
                 {
                     logger.LogInformation("Processing packages for name '{Name}'", name);
 
@@ -60,17 +72,16 @@ public class Worker(
                     logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count,
                         name);
 
-                Console.WriteLine($"Found {packagesToDelete.Count} packages to delete for name '{name}':");
+                    await DeletePackages(packagesToDelete, cancellationToken);
-                foreach (var pkg in packagesToDelete)
-                {
-                    Console.WriteLine($"- {pkg.Name} {pkg.Version}");
-                }
-
-                // await DeletePackages(packagesToDelete, cancellationToken);
                     logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
 
                     logger.LogInformation("Cleanup finished for name '{Name}'", name);
                 }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "Failed to delete package {PackageName}", name);
+                }
+            }
 
             logger.LogInformation("All package names processed successfully");
         }

sh.actions.sln.DotSettings.user

@@ -0,0 +1,4 @@
+<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/Environment/UnitTesting/UnitTestSessionStore/Sessions/=6fbf28ff_002Db08e_002D4d2b_002D8694_002D3f25abc9fe16/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &amp;lt;sh.actions.package-cleanup.Tests&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+  &lt;Project Location="/home/sven/dev/git_sh-edraft_de/actions/sh.actions.package-cleanup.Tests" Presentation="&amp;lt;sh.actions.package-cleanup.Tests&amp;gt;" /&gt;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>