From 91b7dd71e3d4a3404afc6b269c7ebbe288c287da Mon Sep 17 00:00:00 2001
From: "A. B. M. Mahmudul Hasan" <abmmhasan@users.noreply.github.com>
Date: Thu, 17 Sep 2026 13:04:31 +0600
Subject: [PATCH 1/3] test: cover release publish recovery

---
 tests/release-contract.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/release-contract.sh b/tests/release-contract.sh
index f0c7901..9293bb6 100755
--- a/tests/release-contract.sh
+++ b/tests/release-contract.sh
@@ -11,6 +11,9 @@ for contract in \
   'docker/metadata-action@v6' \
   'docker/build-push-action@v7' \
   'actions/attest@v4' \
+  'release_tag:' \
+  'MANUAL_RELEASE_TAG' \
+  'releases/tags/${MANUAL_RELEASE_TAG}' \
   'PUBLISH_RELEASE_TAG' \
   'Enforce immutable release tags' \
   'linux/amd64,linux/arm64' \
@@ -20,6 +23,7 @@ for contract in \
 done
 
 grep -Fq "cron: '0 0 * * 0'" "$workflow"
+grep -Fq 'types: [published]' "$workflow"
 
 if grep -Fq 'actions/checkout@v4' "$workflow"; then
   echo 'Legacy checkout action detected.' >&2

From ac07d293c8a1ad9f549472c751898ff8b3b352c6 Mon Sep 17 00:00:00 2001
From: "A. B. M. Mahmudul Hasan" <abmmhasan@users.noreply.github.com>
Date: Thu, 17 Sep 2026 13:06:39 +0600
Subject: [PATCH 2/3] fix: add release publish recovery path

---
 .github/workflows/docker.publish.yml | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/.github/workflows/docker.publish.yml b/.github/workflows/docker.publish.yml
index c1ee4b4..52083af 100644
--- a/.github/workflows/docker.publish.yml
+++ b/.github/workflows/docker.publish.yml
@@ -6,6 +6,11 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Published release tag to recover; leave empty to refresh latest only'
+        required: false
+        type: string
 
 concurrency:
   group: docker-publish
@@ -36,6 +41,7 @@ jobs:
           EVENT_RELEASE_TAG: ${{ github.event.release.tag_name }}
           EVENT_RELEASE_DRAFT: ${{ github.event.release.draft }}
           EVENT_RELEASE_PRERELEASE: ${{ github.event.release.prerelease }}
+          MANUAL_RELEASE_TAG: ${{ inputs.release_tag }}
         run: |
           set -euo pipefail
 
@@ -45,6 +51,23 @@ jobs:
               exit 1
             fi
             RELEASE_TAG="$EVENT_RELEASE_TAG"
+            PUBLISH_RELEASE_TAG=true
+            VERIFY_TAG="$RELEASE_TAG"
+          elif [[ "$EVENT_NAME" == workflow_dispatch && -n "$MANUAL_RELEASE_TAG" ]]; then
+            release_json="$(gh api "repos/${GITHUB_REPOSITORY}/releases/tags/${MANUAL_RELEASE_TAG}")"
+            RELEASE_TAG="$(jq -r '.tag_name // empty' <<<"$release_json")"
+            release_draft="$(jq -r '.draft' <<<"$release_json")"
+            release_prerelease="$(jq -r '.prerelease' <<<"$release_json")"
+
+            [[ "$RELEASE_TAG" == "$MANUAL_RELEASE_TAG" ]] || {
+              echo "Published release tag could not be resolved: $MANUAL_RELEASE_TAG" >&2
+              exit 1
+            }
+            [[ "$release_draft" == false && "$release_prerelease" == false ]] || {
+              echo "Manual recovery refuses draft/prerelease release: $MANUAL_RELEASE_TAG" >&2
+              exit 1
+            }
+
             PUBLISH_RELEASE_TAG=true
             VERIFY_TAG="$RELEASE_TAG"
           else
@@ -71,6 +94,14 @@ jobs:
             echo "VERIFY_TAG=$VERIFY_TAG"
           } >> "$GITHUB_ENV"
 
+          {
+            echo '## Publish resolution'
+            echo
+            echo "- Event: \`$EVENT_NAME\`"
+            echo "- Apache source release: \`$RELEASE_TAG\`"
+            echo "- Publish immutable release tag: \`$PUBLISH_RELEASE_TAG\`"
+          } >> "$GITHUB_STEP_SUMMARY"
+
       - name: Check out exact release source
         uses: actions/checkout@v7
         with:

From 425f8e629ec641a3a14096153601b35590d9822d Mon Sep 17 00:00:00 2001
From: "A. B. M. Mahmudul Hasan" <abmmhasan@users.noreply.github.com>
Date: Thu, 17 Sep 2026 13:08:34 +0600
Subject: [PATCH 3/3] test: fix release recovery shellcheck

---
 tests/release-contract.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/release-contract.sh b/tests/release-contract.sh
index 9293bb6..1d4f5ca 100755
--- a/tests/release-contract.sh
+++ b/tests/release-contract.sh
@@ -13,7 +13,7 @@ for contract in \
   'actions/attest@v4' \
   'release_tag:' \
   'MANUAL_RELEASE_TAG' \
-  'releases/tags/${MANUAL_RELEASE_TAG}' \
+  "releases/tags/\${MANUAL_RELEASE_TAG}" \
   'PUBLISH_RELEASE_TAG' \
   'Enforce immutable release tags' \
   'linux/amd64,linux/arm64' \