Added output manually

2026-02-15 10:36:03 +01:00
10 changed files with 40 additions and 230 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -1,45 +0,0 @@
-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"
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@

 bin/
 obj/
-publish/

 # Environment Variables - DO NOT COMMIT
 .env
--- a/package-cleanup/action.yaml
+++ b/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,npm"
+    default: "Container,PyPi,NuGet"
  api_token:
    description: "API token for authentication"
    required: true
@@ -23,19 +23,21 @@ 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: |
-        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
+        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/package-cleanup-linux-x64

        # Make executable
        chmod +x package-cleanup-linux-x64
@@ -52,5 +54,6 @@ runs:
        DRY_RUN: ${{ inputs.dry_run }}
        GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
      run: |
-        ./package-cleanup-linux-x64
-
+        echo "Starting cleanup..."
+        ./package-cleanup-linux-x64 > output.txt
+        cat output.txt
--- a/set-version/action.yaml
+++ b/set-version/action.yaml
@@ -25,58 +25,29 @@ runs:
        git fetch --tags

    - name: Calculate Version
-      id: calculate
      shell: bash
      run: |
-        # Regular date with leading zeros
-        DATE_LEADING=$(date +'%Y.%m.%d')
+        DATE=$(date +'%Y.%m.%d')
+        TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)

-        # Year, month and day without leading zeros for alternate formats
-        YEAR=$(date +'%Y')
-        MONTH_NL=$(date +%-m)
-        DAY_NL=$(date +%-d)
-
-        TAG_COUNT=$(git tag -l "${DATE_LEADING}.*" | wc -l)
-
-        if [ "${TAG_COUNT}" -eq 0 ]; then
+        if [ "$TAG_COUNT" -eq 0 ]; then
          BUILD_NUMBER=0
        else
-          BUILD_NUMBER=$((${TAG_COUNT} + 1))
+          BUILD_NUMBER=$(($TAG_COUNT + 1))
        fi

        VERSION_SUFFIX="${{ inputs.version_suffix }}"
        SUFFIX_SEPARATOR="${{ inputs.suffix_separator }}"

-        # Regular (keeps leading zeros in date)
        if [ -n "$VERSION_SUFFIX" ]; then
-          BUILD_VERSION="${DATE_LEADING}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+          BUILD_VERSION="${DATE}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
        else
-          BUILD_VERSION="${DATE_LEADING}.${BUILD_NUMBER}"
+          BUILD_VERSION="${DATE}.${BUILD_NUMBER}"
        fi

-        # Dotnet variant: year.month.day.build (no leading zeros for month/day)
-        DOTNET_DATE="${YEAR}.${MONTH_NL}.${DAY_NL}"
-        if [ -n "$VERSION_SUFFIX" ]; then
-          DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
-        else
-          DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}"
-        fi
-
-        # NPM variant: year.month.(day concatenated with build) e.g. 2026.2.221 for day=22 build=1
-        NPM_DAY_BUILD="${DAY_NL}${BUILD_NUMBER}"
-        if [ -n "$VERSION_SUFFIX" ]; then
-          NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
-        else
-          NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}"
-        fi
-
-        # Write the versions as artifacts for backward compatibility and accessibility
        echo "$BUILD_VERSION" > version.txt
-        echo "$DOTNET_VERSION" > dotnet-version.txt
-        echo "$NPM_VERSION" > npm-version.txt
-
-        # Export regular version to environment (backwards-compatible)
        echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
+        echo "Generated version: $BUILD_VERSION"

    - name: Create Git Tag
      shell: bash
@@ -92,15 +63,3 @@ runs:
      with:
        name: version
        path: version.txt
-
-    - name: Upload Dotnet Version Artifact
-      uses: https://github.com/actions/upload-artifact@v3
-      with:
-        name: dotnet-version
-        path: dotnet-version.txt
-
-    - name: Upload NPM Version Artifact
-      uses: https://github.com/actions/upload-artifact@v3
-      with:
-        name: npm-version
-        path: npm-version.txt
--- a/sh.actions.package-cleanup.Tests/Service/PackageServiceTests.cs
+++ b/sh.actions.package-cleanup.Tests/Service/PackageServiceTests.cs
@@ -22,29 +22,6 @@ 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()
    {
@@ -125,26 +102,7 @@ public class PackageFilterTests
        "2024.8.10.0-exp",
        "2024.8.10.1-exp",
        "2024.8.11.0-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",
+        "2024.8.11.2-exp"
    ];

    private readonly List<string> _versionsToHold =
@@ -181,9 +139,7 @@ public class PackageFilterTests
        "0.1.1-exp",
        "0.1.2-exp",
        "2024.8.11.0-exp",
-        "2024.8.11.2-exp",
-        "2026.2.21.27-dev",
-        "2026.2.21.26-dev",
+        "2024.8.11.2-exp"
    ];

    private List<string> _expectDeleted => _versions.Except(_versionsToHold).ToList();
--- a/sh.actions.package-cleanup/Program.cs
+++ b/sh.actions.package-cleanup/Program.cs
@@ -3,13 +3,6 @@ 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)
--- a/sh.actions.package-cleanup/Service/GiteaPackageService.cs
+++ b/sh.actions.package-cleanup/Service/GiteaPackageService.cs
@@ -1,6 +1,5 @@
 namespace sh.actions.package_cleanup.Service;

-using System;
 using System.Net.Http.Json;
 using Microsoft.Extensions.Logging;
 using sh.actions.package_cleanup.Models;
@@ -11,10 +10,8 @@ public class GiteaPackageService(
    HttpClient httpClient)
    : IGiteaPackageService
 {
-    private static string EncodePathSegment(string? s) => Uri.EscapeDataString((s ?? string.Empty));
-
    private string GetBaseUrl() =>
-        $"{configuration["URL"]?.TrimEnd('/')}/packages/{EncodePathSegment(configuration["OWNER"]) }";
+        $"{configuration["URL"]?.TrimEnd('/')}/packages/{configuration["OWNER"]}";

    private void AddAuthorizationHeader(HttpRequestMessage request)
    {
@@ -48,10 +45,7 @@ public class GiteaPackageService(

                while (true)
                {
-                    var encodedType = EncodePathSegment(type);
-                    var encodedName = EncodePathSegment(name);
-
-                    var url = $"{baseUrl}/{encodedType}/{encodedName}?page={page}";
+                    var url = $"{baseUrl}/{type}/{name}?page={page}";
                    logger.LogInformation("Fetching packages from Gitea: {Url}", url);

                    var request = new HttpRequestMessage(HttpMethod.Get, url);
@@ -132,11 +126,7 @@ public class GiteaPackageService(
        try
        {
            var baseUrl = GetBaseUrl();
-            var encodedType = EncodePathSegment(package.Type);
-            var encodedName = EncodePathSegment(package.Name);
-            var encodedVersion = EncodePathSegment(package.Version);
-
-            var url = $"{baseUrl}/{encodedType}/{encodedName}/{encodedVersion}";
+            var url = $"{baseUrl}/{package.Type}/{package.Name}/{package.Version}";
            logger.LogInformation("Deleting package {PackageName} (ID: {PackageId}) from Gitea", 
                package.Name, package.Id);

--- a/sh.actions.package-cleanup/Worker.cs
+++ b/sh.actions.package-cleanup/Worker.cs
@@ -17,8 +17,6 @@ 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)
@@ -39,12 +37,6 @@ 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);
@@ -56,12 +48,8 @@ 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);

@@ -77,11 +65,6 @@ public class Worker(

                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");
        }
--- a/sh.actions.package-cleanup/sh.actions.package-cleanup.csproj
+++ b/sh.actions.package-cleanup/sh.actions.package-cleanup.csproj
@@ -6,41 +6,10 @@
        <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>
--- a/sh.actions.sln.DotSettings.user
+++ b/sh.actions.sln.DotSettings.user
@@ -1,4 +1,7 @@
 <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>
+	<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>