chore: compare digest with retry before fail (#57)

Author: DerekRoberts

.github/codeowners

@@ -1,5 +1,5 @@
 # Matched against repo root (asterisk)
-*                         @mishraomp @DerekRoberts
+*                         @mishraomp @cberg-aot @DerekRoberts
 
 # Matched against directories
 # /.github/workflows/       @mishraomp @DerekRoberts

.github/workflows/.pr-close.yml

@@ -100,6 +100,25 @@ jobs:
           INSPECT="docker manifest inspect ghcr.io/${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}"
           SOURCE=$(${INSPECT}:${{ inputs.tag_promote }} | jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest')
           TARGET=$(${INSPECT}:${{ inputs.target }} | jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest')
+          if [ "${SOURCE}" != "${TARGET}" ]; then
+            echo "ERROR: Tagging failed!"
+            echo "RETRY=true" >> $GITHUB_ENV
+          fi
+
+      - uses: shrink/actions-docker-registry-tag@v4
+        if: env.RETRY == 'true'
+        with:
+          registry: ghcr.io
+          repository: ${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}
+          target: ${{ inputs.target }}
+          tags: ${{ inputs.tag_promote }}
+
+      - if: env.RETRY == 'true'
+        run: |
+          # Verify tagging after retry
+          INSPECT="docker manifest inspect ghcr.io/${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}"
+          SOURCE=$(${INSPECT}:${{ inputs.tag_promote }} | jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest')
+          TARGET=$(${INSPECT}:${{ inputs.target }} | jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest')
           if [ "${SOURCE}" != "${TARGET}" ]; then
             echo "ERROR: Tagging failed!"
             exit 1

.github/workflows/pr-open.yml

@@ -32,6 +32,16 @@ jobs:
           target: latest
           tags: ${{ github.event.number }}
 
+      - run: |
+          # Verify tagging
+          INSPECT="docker manifest inspect ghcr.io/${{ github.repository }}/${{ matrix.package }}"
+          SOURCE=$(${INSPECT}:latest | jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest')
+          TARGET=$(${INSPECT}:${{ github.event.number }} | jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest')
+          if [ "${SOURCE}" != "${TARGET}" ]; then
+            echo "ERROR: Tagging failed!"
+            exit 1
+          fi
+
   deploys:
     name: Deploys
     needs: [builds, validate]