improved set version by adding target

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
@@ -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
@@ -54,6 +52,5 @@ runs:
         DRY_RUN: ${{ inputs.dry_run }}
         GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
       run: |
-        echo "Starting cleanup..."
         ./package-cleanup-linux-x64
-        echo "Cleanup completed."
+

set-version/action.yaml

@@ -10,6 +10,10 @@ inputs:
     description: "Separator between version and suffix (either '.' or '-')"
     required: false
     default: "-"
+  target:
+    description: "Project type (e.g. dotnet, npm)"
+    required: false
+    default: ""
 
 runs:
   using: "composite"
@@ -23,12 +27,39 @@ runs:
       shell: bash
       run: |
         git fetch --tags
-
-    - name: Calculate Version
+    - name: Prepare variables
+      id: prepare
       shell: bash
       run: |
-        DATE=$(date +'%Y.%m.%d')
-        TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
+        YEAR=$(date +'%Y')
+        MONTH=$(date +%-m)
+        DAY=$(date +%-d)
+        VERSION_SUFFIX="${{ inputs.version_suffix }}"
+        SUFFIX_SEPARATOR="${{ inputs.suffix_separator }}"
+
+        # Count tags for day and month prefixes to support different targets
+        TAG_COUNT_DAY=$(git tag -l "${YEAR}.${MONTH}.${DAY}.*" | wc -l)
+        TAG_COUNT_MONTH=$(git tag -l "${YEAR}.${MONTH}.*" | wc -l)
+
+        echo "year=$YEAR" >> $GITHUB_OUTPUT
+        echo "month=$MONTH" >> $GITHUB_OUTPUT
+        echo "day=$DAY" >> $GITHUB_OUTPUT
+        echo "version_suffix=$VERSION_SUFFIX" >> $GITHUB_OUTPUT
+        echo "suffix_separator=$SUFFIX_SEPARATOR" >> $GITHUB_OUTPUT
+        echo "tag_count_day=$TAG_COUNT_DAY" >> $GITHUB_OUTPUT
+        echo "tag_count_month=$TAG_COUNT_MONTH" >> $GITHUB_OUTPUT
+
+    - name: Calculate Version (dotnet)
+      id: calc_dotnet
+      if: ${{ inputs.target == 'dotnet' }}
+      shell: bash
+      run: |
+        YEAR=${{ steps.prepare.outputs.year }}
+        MONTH=${{ steps.prepare.outputs.month }}
+        DAY=${{ steps.prepare.outputs.day }}
+        VERSION_SUFFIX=${{ steps.prepare.outputs.version_suffix }}
+        SUFFIX_SEPARATOR=${{ steps.prepare.outputs.suffix_separator }}
+        TAG_COUNT=${{ steps.prepare.outputs.tag_count_day }}
 
         if [ "$TAG_COUNT" -eq 0 ]; then
           BUILD_NUMBER=0
@@ -36,15 +67,74 @@ runs:
           BUILD_NUMBER=$(($TAG_COUNT + 1))
         fi
 
-        VERSION_SUFFIX="${{ inputs.version_suffix }}"
-        SUFFIX_SEPARATOR="${{ inputs.suffix_separator }}"
+        if [ -n "$VERSION_SUFFIX" ]; then
+          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+        else
+          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}"
+        fi
+
+        echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+
+    - name: Calculate Version (angular)
+      id: calc_angular
+      if: ${{ inputs.target == 'angular' }}
+      shell: bash
+      run: |
+        YEAR=${{ steps.prepare.outputs.year }}
+        MONTH=${{ steps.prepare.outputs.month }}
+        DAY=${{ steps.prepare.outputs.day }}
+        VERSION_SUFFIX=${{ steps.prepare.outputs.version_suffix }}
+        SUFFIX_SEPARATOR=${{ steps.prepare.outputs.suffix_separator }}
+        TAG_COUNT=${{ steps.prepare.outputs.tag_count_month }}
+
+        if [ "$TAG_COUNT" -eq 0 ]; then
+          BUILD_NUMBER=0
+        else
+          BUILD_NUMBER=$(($TAG_COUNT + 1))
+        fi
+
+        LAST_PART="${DAY}${BUILD_NUMBER}"
+        if [ -n "$VERSION_SUFFIX" ]; then
+          BUILD_VERSION="${YEAR}.${MONTH}.${LAST_PART}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+        else
+          BUILD_VERSION="${YEAR}.${MONTH}.${LAST_PART}"
+        fi
+
+        echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+
+    - name: Calculate Version (default)
+      id: calc_default
+      if: ${{ inputs.target != 'dotnet' && inputs.target != 'angular' }}
+      shell: bash
+      run: |
+        YEAR=${{ steps.prepare.outputs.year }}
+        MONTH=${{ steps.prepare.outputs.month }}
+        DAY=${{ steps.prepare.outputs.day }}
+        VERSION_SUFFIX=${{ steps.prepare.outputs.version_suffix }}
+        SUFFIX_SEPARATOR=${{ steps.prepare.outputs.suffix_separator }}
+        TAG_COUNT=${{ steps.prepare.outputs.tag_count_day }}
+
+        if [ "$TAG_COUNT" -eq 0 ]; then
+          BUILD_NUMBER=0
+        else
+          BUILD_NUMBER=$(($TAG_COUNT + 1))
+        fi
 
         if [ -n "$VERSION_SUFFIX" ]; then
-          BUILD_VERSION="${DATE}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
         else
-          BUILD_VERSION="${DATE}.${BUILD_NUMBER}"
+          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}"
         fi
 
+        echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+
+    - name: Publish Version
+      shell: bash
+      run: |
+        BUILD_VERSION="${{ steps.calc_dotnet.outputs.build_version }}"
+        if [ -z "$BUILD_VERSION" ]; then BUILD_VERSION="${{ steps.calc_angular.outputs.build_version }}"; fi
+        if [ -z "$BUILD_VERSION" ]; then BUILD_VERSION="${{ steps.calc_default.outputs.build_version }}"; fi
+
         echo "$BUILD_VERSION" > version.txt
         echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
         echo "Generated version: $BUILD_VERSION"

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)

sh.actions.package-cleanup/Service/GiteaPackageService.cs

@@ -1,5 +1,6 @@
 namespace sh.actions.package_cleanup.Service;
 
+using System;
 using System.Net.Http.Json;
 using Microsoft.Extensions.Logging;
 using sh.actions.package_cleanup.Models;
@@ -10,8 +11,10 @@ public class GiteaPackageService(
     HttpClient httpClient)
     : IGiteaPackageService
 {
+    private static string EncodePathSegment(string? s) => Uri.EscapeDataString((s ?? string.Empty));
+
     private string GetBaseUrl() =>
-        $"{configuration["URL"]?.TrimEnd('/')}/packages/{configuration["OWNER"]}";
+        $"{configuration["URL"]?.TrimEnd('/')}/packages/{EncodePathSegment(configuration["OWNER"]) }";
 
     private void AddAuthorizationHeader(HttpRequestMessage request)
     {
@@ -45,7 +48,10 @@ public class GiteaPackageService(
 
                 while (true)
                 {
-                    var url = $"{baseUrl}/{type}/{name}?page={page}";
+                    var encodedType = EncodePathSegment(type);
+                    var encodedName = EncodePathSegment(name);
+
+                    var url = $"{baseUrl}/{encodedType}/{encodedName}?page={page}";
                     logger.LogInformation("Fetching packages from Gitea: {Url}", url);
 
                     var request = new HttpRequestMessage(HttpMethod.Get, url);
@@ -126,7 +132,11 @@ public class GiteaPackageService(
         try
         {
             var baseUrl = GetBaseUrl();
-            var url = $"{baseUrl}/{package.Type}/{package.Name}/{package.Version}";
+            var encodedType = EncodePathSegment(package.Type);
+            var encodedName = EncodePathSegment(package.Name);
+            var encodedVersion = EncodePathSegment(package.Version);
+
+            var url = $"{baseUrl}/{encodedType}/{encodedName}/{encodedVersion}";
             logger.LogInformation("Deleting package {PackageName} (ID: {PackageId}) from Gitea", 
                 package.Name, package.Id);
 

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,22 +56,31 @@ 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)
             {
-                logger.LogInformation("Processing packages for name '{Name}'", name);
+                try
+                {
+                    logger.LogInformation("Processing packages for name '{Name}'", name);
 
-                var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList();
-                logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name);
+                    var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList();
+                    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);
+                    var packagesToDelete = packageService.FilterPackagesToDelete(packages);
+                    logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count,
+                        name);
 
-                await DeletePackages(packagesToDelete, cancellationToken);
-                logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
+                    await DeletePackages(packagesToDelete, cancellationToken);
+                    logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
 
-                logger.LogInformation("Cleanup finished for name '{Name}'", 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>