From b265bb81c1394a7116c2f8605c275d5a91a9948a Mon Sep 17 00:00:00 2001
From: lklimek <842586+lklimek@users.noreply.github.com>
Date: Fri, 13 Dec 2024 13:25:40 +0100
Subject: [PATCH] ci: fix artifact upload issue on release build (#2389)

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

diff --git a/.github/workflows/release-docker-image.yml b/.github/workflows/release-docker-image.yml
index e7eea70ac8..51b829982c 100644
--- a/.github/workflows/release-docker-image.yml
+++ b/.github/workflows/release-docker-image.yml
@@ -79,10 +79,16 @@ jobs:
           touch "${{ env.DIGEST_DIR_PATH }}/${digest#sha256:}"
           ls -lah ${{ env.DIGEST_DIR_PATH }}
 
+      - name: Format DIGEST_PLATFORM
+        run: |
+          PLATFORM="${{ matrix.platform }}"
+          # replace slash (/) with dash (-)
+          echo "DIGEST_PLATFORM=${PLATFORM//\//-}" >> $GITHUB_ENV
+
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.DIGEST_NAME }}
+          name: ${{ env.DIGEST_NAME }}-${{ env.DIGEST_PLATFORM }}
           path: ${{ env.DIGEST_DIR_PATH }}/*
           if-no-files-found: error
           retention-days: 1
@@ -93,10 +99,11 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.DIGEST_NAME }}
+          pattern: ${{ env.DIGEST_NAME }}*
           path: ${{ env.DIGEST_DIR_PATH }}
+          merge-multiple: true
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3