Compare commits
2 Commits
2026.02.21
...
2026.2.22.
| Author | SHA1 | Date | |
|---|---|---|---|
| 17180e88ea | |||
| 2f1a200bdc |
@@ -10,6 +10,10 @@ inputs:
|
|||||||
description: "Separator between version and suffix (either '.' or '-')"
|
description: "Separator between version and suffix (either '.' or '-')"
|
||||||
required: false
|
required: false
|
||||||
default: "-"
|
default: "-"
|
||||||
|
target:
|
||||||
|
description: "Project type (e.g. dotnet, npm)"
|
||||||
|
required: false
|
||||||
|
default: ""
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
@@ -23,12 +27,39 @@ runs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
git fetch --tags
|
git fetch --tags
|
||||||
|
- name: Prepare variables
|
||||||
- name: Calculate Version
|
id: prepare
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
DATE=$(date +'%Y.%m.%d')
|
YEAR=$(date +'%Y')
|
||||||
TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
|
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
|
if [ "$TAG_COUNT" -eq 0 ]; then
|
||||||
BUILD_NUMBER=0
|
BUILD_NUMBER=0
|
||||||
@@ -36,15 +67,74 @@ runs:
|
|||||||
BUILD_NUMBER=$(($TAG_COUNT + 1))
|
BUILD_NUMBER=$(($TAG_COUNT + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
VERSION_SUFFIX="${{ inputs.version_suffix }}"
|
if [ -n "$VERSION_SUFFIX" ]; then
|
||||||
SUFFIX_SEPARATOR="${{ inputs.suffix_separator }}"
|
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
|
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
|
else
|
||||||
BUILD_VERSION="${DATE}.${BUILD_NUMBER}"
|
BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}"
|
||||||
fi
|
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 "$BUILD_VERSION" > version.txt
|
||||||
echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
|
echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
|
||||||
echo "Generated version: $BUILD_VERSION"
|
echo "Generated version: $BUILD_VERSION"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
namespace sh.actions.package_cleanup.Service;
|
namespace sh.actions.package_cleanup.Service;
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Net.Http.Json;
|
using System.Net.Http.Json;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using sh.actions.package_cleanup.Models;
|
using sh.actions.package_cleanup.Models;
|
||||||
@@ -10,8 +11,10 @@ public class GiteaPackageService(
|
|||||||
HttpClient httpClient)
|
HttpClient httpClient)
|
||||||
: IGiteaPackageService
|
: IGiteaPackageService
|
||||||
{
|
{
|
||||||
|
private static string EncodePathSegment(string? s) => Uri.EscapeDataString((s ?? string.Empty));
|
||||||
|
|
||||||
private string GetBaseUrl() =>
|
private string GetBaseUrl() =>
|
||||||
$"{configuration["URL"]?.TrimEnd('/')}/packages/{configuration["OWNER"]}";
|
$"{configuration["URL"]?.TrimEnd('/')}/packages/{EncodePathSegment(configuration["OWNER"]) }";
|
||||||
|
|
||||||
private void AddAuthorizationHeader(HttpRequestMessage request)
|
private void AddAuthorizationHeader(HttpRequestMessage request)
|
||||||
{
|
{
|
||||||
@@ -45,7 +48,10 @@ public class GiteaPackageService(
|
|||||||
|
|
||||||
while (true)
|
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);
|
logger.LogInformation("Fetching packages from Gitea: {Url}", url);
|
||||||
|
|
||||||
var request = new HttpRequestMessage(HttpMethod.Get, url);
|
var request = new HttpRequestMessage(HttpMethod.Get, url);
|
||||||
@@ -126,7 +132,11 @@ public class GiteaPackageService(
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
var baseUrl = GetBaseUrl();
|
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",
|
logger.LogInformation("Deleting package {PackageName} (ID: {PackageId}) from Gitea",
|
||||||
package.Name, package.Id);
|
package.Name, package.Id);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user