Compare commits

...

12 Commits

Author SHA1 Message Date
ff8cd3350b Added more debugging
All checks were successful
Build on push / prepare (push) Successful in 6s
Build on push / build (push) Successful in 18s
2026-02-15 12:49:58 +01:00
7e4abe9efd Readded delete function
All checks were successful
Build on push / prepare (push) Successful in 6s
Build on push / build (push) Successful in 19s
2026-02-15 12:46:24 +01:00
706d9f89f0 Fixed download url of cleanup tool
All checks were successful
Build on push / prepare (push) Successful in 27s
Build on push / build (push) Successful in 30s
2026-02-15 12:42:40 +01:00
a2e4152d5e Should fix exec problems
All checks were successful
Build on push / prepare (push) Successful in 27s
Build on push / build (push) Successful in 28s
2026-02-15 12:24:00 +01:00
4497b67b70 force dry run via start arg
All checks were successful
Build on push / prepare (push) Successful in 20s
Build on push / build (push) Successful in 39s
2026-02-15 12:17:45 +01:00
c1a882d1a2 Cleanup to ensure repull
All checks were successful
Build on push / prepare (push) Successful in 30s
Build on push / build (push) Successful in 40s
2026-02-15 12:12:52 +01:00
3ba2b71f4a Hold to debug
All checks were successful
Build on push / prepare (push) Successful in 8s
Build on push / build (push) Successful in 21s
2026-02-15 12:08:45 +01:00
17a4e57fa4 Added test output
All checks were successful
Build on push / prepare (push) Successful in 6s
Build on push / build (push) Successful in 19s
2026-02-15 12:07:19 +01:00
79902f323d Better output
All checks were successful
Build on push / prepare (push) Successful in 7s
Build on push / build (push) Successful in 22s
2026-02-15 12:03:52 +01:00
213fc4685d Build as single file
All checks were successful
Build on push / prepare (push) Successful in 6s
Build on push / build (push) Successful in 18s
2026-02-15 11:57:46 +01:00
c6fe9f7397 Added output manually
All checks were successful
Build on push / prepare (push) Successful in 6s
Build on push / build (push) Successful in 14s
2026-02-15 10:37:47 +01:00
4ff5680310 Changed logging
All checks were successful
Build on push / prepare (push) Successful in 7s
Build on push / build (push) Successful in 15s
2026-02-15 10:29:52 +01:00
6 changed files with 70 additions and 62 deletions

1
.gitignore vendored
View File

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

View File

@@ -23,21 +23,19 @@ inputs:
required: false required: false
default: "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: runs:
using: "composite" using: "composite"
steps: steps:
- name: Download and test package-cleanup tool - name: Download and test package-cleanup tool
shell: bash shell: bash
run: | 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 # Make executable
chmod +x package-cleanup-linux-x64 chmod +x package-cleanup-linux-x64
@@ -54,5 +52,5 @@ runs:
DRY_RUN: ${{ inputs.dry_run }} DRY_RUN: ${{ inputs.dry_run }}
GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }} GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
run: | run: |
echo "Starting cleanup..."
./package-cleanup-linux-x64 ./package-cleanup-linux-x64

View File

@@ -3,6 +3,13 @@ using sh.actions.package_cleanup.Service;
var builder = Host.CreateApplicationBuilder(args); 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 builder.Configuration
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.AddJsonFile("appsettings.local.json", optional: true, reloadOnChange: true) .AddJsonFile("appsettings.local.json", optional: true, reloadOnChange: true)
@@ -15,5 +22,9 @@ builder.Services
.AddHostedService<Worker>() .AddHostedService<Worker>()
.AddHttpClient<IGiteaPackageService, GiteaPackageService>(); .AddHttpClient<IGiteaPackageService, GiteaPackageService>();
builder.Logging.ClearProviders();
builder.Logging.AddConsole();
builder.Logging.SetMinimumLevel(LogLevel.Debug);
var host = builder.Build(); var host = builder.Build();
await host.RunAsync(); await host.RunAsync();

View File

@@ -11,56 +11,40 @@ public class Worker(
IGiteaPackageService giteaPackageService IGiteaPackageService giteaPackageService
) : BackgroundService ) : 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"; var dryRun = configuration["DRY_RUN"]?.ToLower() == "true";
if (dryRun) if (dryRun)
{ {
logger.LogInformation("Dry run enabled, not deleting {Count} packages", packages.Count); 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) foreach (var giteaPackage in packages)
{ {
try try
{ {
await giteaPackageService.DeletePackage(giteaPackage, cancellationToken); await giteaPackageService.DeletePackage(giteaPackage, cancellationToken);
deletedCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.LogError(ex, "Failed to delete package {PackageName} version {Version}", logger.LogError(ex, "Failed to delete package {PackageName} version {Version}",
giteaPackage.Name, giteaPackage.Version); 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) protected override async Task ExecuteAsync(CancellationToken cancellationToken)
{ {
try 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 // Parse comma-separated names
var names = (configuration["NAMES"] ?? "") var names = (configuration["NAMES"] ?? "")
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
@@ -68,43 +52,33 @@ public class Worker(
if (names.Length == 0) if (names.Length == 0)
{ {
logger.LogWarning("No package names configured"); logger.LogWarning("No package names configured");
WriteGitHubOutput("deleted_packages", "0");
WriteGitHubOutput("processed_names", "0");
appLifetime.StopApplication(); appLifetime.StopApplication();
return; return;
} }
var totalDeleted = 0;
// Process each name separately: collect -> filter -> delete // Process each name separately: collect -> filter -> delete
foreach (var name in names) foreach (var name in names)
{ {
logger.LogInformation("Processing packages for name '{Name}'", name); logger.LogInformation("Processing packages for name '{Name}'", name);
var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList(); var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList();
logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name); logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name);
var packagesToDelete = packageService.FilterPackagesToDelete(packages); 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);
totalDeleted += deletedCount; await DeletePackages(packagesToDelete, cancellationToken);
logger.LogInformation("Deleted {Count} packages for name '{Name}'", deletedCount, name); 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);
} }
logger.LogInformation("All package names processed successfully"); 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) catch (Exception ex)
{ {
logger.LogError(ex, "Cleanup failed with an error"); logger.LogError(ex, "Cleanup failed with an error");
WriteGitHubOutput("deleted_packages", "0");
WriteGitHubOutput("processed_names", "0");
} }
finally finally
{ {

View File

@@ -6,10 +6,41 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-sh.actions.package_cleanup-2b7a013f-ec22-4325-9832-0c9ca9b8ced9</UserSecretsId> <UserSecretsId>dotnet-sh.actions.package_cleanup-2b7a013f-ec22-4325-9832-0c9ca9b8ced9</UserSecretsId>
<RootNamespace>sh.actions.package_cleanup</RootNamespace> <RootNamespace>sh.actions.package_cleanup</RootNamespace>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" /> <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
</ItemGroup> </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> </Project>

View File

@@ -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>