From ddbffee4ae8ce6c1c83dbd09c638f87c7f0043e7 Mon Sep 17 00:00:00 2001 From: alpha nerd Date: Tue, 7 Apr 2026 16:53:07 +0200 Subject: [PATCH] fix: tidy up in workflow merge step --- .forgejo/workflows/docker-publish-semantic.yml | 9 +++++---- .forgejo/workflows/docker-publish.yml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/docker-publish-semantic.yml b/.forgejo/workflows/docker-publish-semantic.yml index 2174f21..eca84c5 100644 --- a/.forgejo/workflows/docker-publish-semantic.yml +++ b/.forgejo/workflows/docker-publish-semantic.yml @@ -148,10 +148,11 @@ jobs: - name: Delete intermediate platform tags run: | - CACHE_ENCODED=$(echo "${{ env.CACHE_IMAGE }}" | sed 's|/|%2F|g') + CACHE_NAME="${{ env.CACHE_IMAGE }}" + CACHE_NAME="${CACHE_NAME##*/}" for tag in platform-semantic-amd64 platform-semantic-arm64; do - curl -s -X DELETE \ + STATUS=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE \ -H "Authorization: token ${{ secrets.REGISTRY_TOKEN }}" \ - "https://${{ env.REGISTRY }}/api/v1/packages/${{ github.repository_owner }}/container/${CACHE_ENCODED}/${tag}" \ - && echo "Deleted ${tag}" || echo "Failed to delete ${tag} (ignored)" + "https://${{ env.REGISTRY }}/api/v1/packages/${{ github.repository_owner }}/container/${CACHE_NAME}/${tag}") + echo "DELETE ${tag}: HTTP ${STATUS}" done diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml index c93ec2e..c9d5eed 100644 --- a/.forgejo/workflows/docker-publish.yml +++ b/.forgejo/workflows/docker-publish.yml @@ -138,10 +138,11 @@ jobs: - name: Delete intermediate platform tags run: | - IMAGE_ENCODED=$(echo "${{ env.IMAGE_NAME }}" | sed 's|/|%2F|g') + PACKAGE_NAME="${{ env.IMAGE_NAME }}" + PACKAGE_NAME="${PACKAGE_NAME##*/}" for tag in platform-amd64 platform-arm64; do - curl -s -X DELETE \ + STATUS=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE \ -H "Authorization: token ${{ secrets.REGISTRY_TOKEN }}" \ - "https://${{ env.REGISTRY }}/api/v1/packages/${{ github.repository_owner }}/container/${IMAGE_ENCODED}/${tag}" \ - && echo "Deleted ${tag}" || echo "Failed to delete ${tag} (ignored)" + "https://${{ env.REGISTRY }}/api/v1/packages/${{ github.repository_owner }}/container/${PACKAGE_NAME}/${tag}") + echo "DELETE ${tag}: HTTP ${STATUS}" done