Compare commits
6 Commits
2026.02.15
...
2026.02.15
| Author | SHA1 | Date | |
|---|---|---|---|
| c8cfa26760 | |||
| 4ff5680310 | |||
| 6d3a5b1930 | |||
| 5dca7e693b | |||
| a2fe4cb960 | |||
| 8cdd6a6e0e |
@@ -33,15 +33,15 @@ jobs:
|
|||||||
|
|
||||||
- name: Build single file executables
|
- name: Build single file executables
|
||||||
run: |
|
run: |
|
||||||
cd sh.actions/sh.actions.package-cleanup
|
cd sh.actions.package-cleanup
|
||||||
|
|
||||||
# Build for Linux x64
|
# 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
|
- name: Upload to Gitea Generic Package Registry
|
||||||
run: |
|
run: |
|
||||||
cd sh.actions/sh.actions.package-cleanup
|
cd sh.actions.package-cleanup
|
||||||
curl -X PUT \
|
curl -X PUT \
|
||||||
-H "Authorization: token ${{ secrets.CI_ACCESS_TOKEN }}" \
|
-H "Authorization: token ${{ secrets.CI_ACCESS_TOKEN }}" \
|
||||||
-T publish/linux-x64/sh.actions.package-cleanup \
|
-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"
|
||||||
|
|||||||
@@ -18,6 +18,18 @@ inputs:
|
|||||||
api_token:
|
api_token:
|
||||||
description: "API token for authentication"
|
description: "API token for authentication"
|
||||||
required: true
|
required: true
|
||||||
|
dry_run:
|
||||||
|
description: "Execute without deleting packages"
|
||||||
|
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:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
@@ -31,6 +43,7 @@ runs:
|
|||||||
chmod +x package-cleanup-linux-x64
|
chmod +x package-cleanup-linux-x64
|
||||||
|
|
||||||
- name: Run package-cleanup
|
- name: Run package-cleanup
|
||||||
|
id: cleanup
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
URL: ${{ inputs.url }}
|
URL: ${{ inputs.url }}
|
||||||
@@ -38,5 +51,9 @@ runs:
|
|||||||
TYPES: ${{ inputs.types }}
|
TYPES: ${{ inputs.types }}
|
||||||
NAMES: ${{ inputs.names }}
|
NAMES: ${{ inputs.names }}
|
||||||
API_TOKEN: ${{ inputs.api_token }}
|
API_TOKEN: ${{ inputs.api_token }}
|
||||||
|
DRY_RUN: ${{ inputs.dry_run }}
|
||||||
|
GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
|
||||||
run: |
|
run: |
|
||||||
./package-cleanup-linux-x64
|
echo "Starting cleanup..."
|
||||||
|
./package-cleanup-linux-x64 > output.txt
|
||||||
|
cat output.txt
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public static class ConfigurationExtension
|
|||||||
public static IConfigurationBuilder EnsureGiteaConfig(this IConfigurationBuilder builder)
|
public static IConfigurationBuilder EnsureGiteaConfig(this IConfigurationBuilder builder)
|
||||||
{
|
{
|
||||||
var configuration = builder.Build();
|
var configuration = builder.Build();
|
||||||
var requiredKeys = new[] { "URL", "OWNER", "TYPES", "NAME", "API_TOKEN" };
|
var requiredKeys = new[] { "URL", "OWNER", "TYPES", "NAMES", "API_TOKEN" };
|
||||||
|
|
||||||
foreach (var key in requiredKeys)
|
foreach (var key in requiredKeys)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,5 +15,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();
|
||||||
|
|||||||
@@ -22,24 +22,75 @@ public class GiteaPackageService(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default)
|
public async Task<IEnumerable<GiteaPackage>> GetPackagesByNameAsync(string name, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var baseUrl = GetBaseUrl();
|
var baseUrl = GetBaseUrl();
|
||||||
var allPackages = new List<GiteaPackage>();
|
var packages = new List<GiteaPackage>();
|
||||||
|
|
||||||
// Parse comma-separated types
|
// Parse comma-separated types
|
||||||
var types = (configuration["TYPE"] ?? "")
|
var types = (configuration["TYPES"] ?? "")
|
||||||
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||||
|
|
||||||
if (types.Length == 0)
|
if (types.Length == 0)
|
||||||
{
|
{
|
||||||
logger.LogWarning("No package types configured");
|
logger.LogWarning("No package types configured");
|
||||||
return allPackages;
|
return packages;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse comma-separated names
|
foreach (var type in types)
|
||||||
|
{
|
||||||
|
var page = 1;
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
var url = $"{baseUrl}/{type}/{name}?page={page}";
|
||||||
|
logger.LogInformation("Fetching packages from Gitea: {Url}", url);
|
||||||
|
|
||||||
|
var request = new HttpRequestMessage(HttpMethod.Get, url);
|
||||||
|
AddAuthorizationHeader(request);
|
||||||
|
|
||||||
|
var response = await httpClient.SendAsync(request, cancellationToken);
|
||||||
|
response.EnsureSuccessStatusCode();
|
||||||
|
|
||||||
|
var fetchedPackages =
|
||||||
|
await response.Content.ReadFromJsonAsync<List<GiteaPackage>>(cancellationToken: cancellationToken)
|
||||||
|
?? [];
|
||||||
|
|
||||||
|
if (fetchedPackages.Count == 0)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
packages.AddRange(fetchedPackages);
|
||||||
|
logger.LogInformation("Fetched {Count} packages from page {Page}", fetchedPackages.Count, page);
|
||||||
|
|
||||||
|
page++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation("Successfully fetched {Count} packages for name '{Name}'", packages.Count, name);
|
||||||
|
return packages;
|
||||||
|
}
|
||||||
|
catch (HttpRequestException ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error fetching packages from Gitea for name '{Name}'", name);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Unexpected error fetching packages for name '{Name}'", name);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var allPackages = new List<GiteaPackage>();
|
||||||
|
|
||||||
var names = (configuration["NAMES"] ?? "")
|
var names = (configuration["NAMES"] ?? "")
|
||||||
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||||
|
|
||||||
@@ -49,38 +100,10 @@ public class GiteaPackageService(
|
|||||||
return allPackages;
|
return allPackages;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var type in types)
|
foreach (var name in names)
|
||||||
{
|
{
|
||||||
foreach (var name in names)
|
var packages = await GetPackagesByNameAsync(name, cancellationToken);
|
||||||
{
|
allPackages.AddRange(packages);
|
||||||
var page = 1;
|
|
||||||
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
var url = $"{baseUrl}/{type}/{name}?page={page}";
|
|
||||||
logger.LogInformation("Fetching packages from Gitea: {Url}", url);
|
|
||||||
|
|
||||||
var request = new HttpRequestMessage(HttpMethod.Get, url);
|
|
||||||
AddAuthorizationHeader(request);
|
|
||||||
|
|
||||||
var response = await httpClient.SendAsync(request, cancellationToken);
|
|
||||||
response.EnsureSuccessStatusCode();
|
|
||||||
|
|
||||||
var packages =
|
|
||||||
await response.Content.ReadFromJsonAsync<List<GiteaPackage>>(cancellationToken: cancellationToken)
|
|
||||||
?? [];
|
|
||||||
|
|
||||||
if (packages.Count == 0)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
allPackages.AddRange(packages);
|
|
||||||
logger.LogInformation("Fetched {Count} packages from page {Page}", packages.Count, page);
|
|
||||||
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.LogInformation("Successfully fetched {Count} packages in total", allPackages.Count);
|
logger.LogInformation("Successfully fetched {Count} packages in total", allPackages.Count);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using sh.actions.package_cleanup.Models;
|
|||||||
|
|
||||||
public interface IGiteaPackageService
|
public interface IGiteaPackageService
|
||||||
{
|
{
|
||||||
|
Task<IEnumerable<GiteaPackage>> GetPackagesByNameAsync(string name, CancellationToken cancellationToken = default);
|
||||||
Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default);
|
Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default);
|
||||||
Task DeletePackage(GiteaPackage package, CancellationToken cancellationToken = default);
|
Task DeletePackage(GiteaPackage package, CancellationToken cancellationToken = default);
|
||||||
}
|
}
|
||||||
@@ -6,8 +6,7 @@ public class PackageService(IGiteaPackageService packageService) : IPackageServi
|
|||||||
{
|
{
|
||||||
public async Task<List<GiteaPackage>> GetFilteredPackages()
|
public async Task<List<GiteaPackage>> GetFilteredPackages()
|
||||||
{
|
{
|
||||||
var packages = (await packageService.GetPackagesByOwnerAsync()).ToList();
|
return (await packageService.GetPackagesByOwnerAsync()).ToList();
|
||||||
return packages;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<GiteaPackage> FilterPackagesToDelete(List<GiteaPackage> packages)
|
public List<GiteaPackage> FilterPackagesToDelete(List<GiteaPackage> packages)
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ public class Worker(
|
|||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var giteaPackage in packages)
|
foreach (var giteaPackage in packages)
|
||||||
@@ -38,15 +37,36 @@ public class Worker(
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var packages = await packageService.GetFilteredPackages();
|
// Parse comma-separated names
|
||||||
logger.LogInformation("Found {Count} packages", packages.Count);
|
var names = (configuration["NAMES"] ?? "")
|
||||||
|
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||||
|
|
||||||
var packagesToDelete = packageService.FilterPackagesToDelete(packages);
|
if (names.Length == 0)
|
||||||
logger.LogInformation("Found {Count} packages to delete", packagesToDelete.Count);
|
{
|
||||||
|
logger.LogWarning("No package names configured");
|
||||||
|
appLifetime.StopApplication();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
await DeletePackages(packagesToDelete, cancellationToken);
|
// Process each name separately: collect -> filter -> delete
|
||||||
|
foreach (var name in names)
|
||||||
|
{
|
||||||
|
logger.LogInformation("Processing packages for name '{Name}'", name);
|
||||||
|
|
||||||
logger.LogInformation("Cleanup finished successfully");
|
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);
|
||||||
|
|
||||||
|
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("All package names processed successfully");
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user