From ce72ec5215c4d6d9b456a319033ab59ced08a1ce Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 3 Mar 2025 09:49:06 +0400
Subject: [PATCH 1/2] Revert "ci: docker: do not override digest (#249)"

This reverts commit 8202b6635c2eeb9cf9bd67a1e17cb65059cbdae3.
---
 .github/workflows/docker.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1849062..9fc8422 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,14 +29,12 @@ jobs:
         include:
           - os: ubuntu-24.04
             platform: linux/amd64
-            platform_short: amd64
           - os: ubuntu-24.04-arm
             platform: linux/arm64
-            platform_short: arm64
     runs-on: ${{ matrix.os }}
     outputs:
-      digest_amd64: ${{ steps.build-amd64.outputs.digest }}
-      digest_arm64: ${{ steps.build-arm64.outputs.digest }}
+      digest_amd64: ${{ steps.build.outputs.digest }}
+      digest_arm64: ${{ steps.build.outputs.digest }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -54,7 +52,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push image
-        id: build-${{ matrix.platform_short }}
+        id: build
         uses: docker/build-push-action@v6
         with:
           platforms: ${{ matrix.platform }}

From 05f51c6f9bfbf394977bcaf2373cb087ccbb2185 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 3 Mar 2025 09:55:16 +0400
Subject: [PATCH 2/2] ci: docker: correct handling of outputs

---
 .github/workflows/docker.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9fc8422..3d434fe 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: true
 
 env:
   ORG: cometbft
@@ -29,12 +29,14 @@ jobs:
         include:
           - os: ubuntu-24.04
             platform: linux/amd64
+            arch: amd64
           - os: ubuntu-24.04-arm
             platform: linux/arm64
+            arch: arm64
     runs-on: ${{ matrix.os }}
     outputs:
-      digest_amd64: ${{ steps.build.outputs.digest }}
-      digest_arm64: ${{ steps.build.outputs.digest }}
+      digest_amd64: ${{ steps.capture-digest.outputs.digest_amd64 }}
+      digest_arm64: ${{ steps.capture-digest.outputs.digest_arm64 }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -60,6 +62,11 @@ jobs:
           tags: |
             ${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.GIT_TAG }}
           push: true
+          outputs: type=image,name=${{ env.ORG }}/${{ env.IMAGE_NAME }},digest=true
+
+      - name: Capture Image Digest
+        id: capture-digest
+        run: echo "digest_${{ matrix.arch }}=${{ steps.build.outputs.digest }}" >> $GITHUB_ENV
 
   merge:
     runs-on: ubuntu-latest