From f4edf9286075a8233b6bff4937e820dd279f58b8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 9 Apr 2024 09:53:21 -0500
Subject: [PATCH] Fix Docker build by ensuring all artifacts are named with
 architecture (amd64 vs arm64)

---
 .github/workflows/reusable-docker-build.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable-docker-build.yml b/.github/workflows/reusable-docker-build.yml
index 2f80ef4ba9..41a2b4b4fe 100644
--- a/.github/workflows/reusable-docker-build.yml
+++ b/.github/workflows/reusable-docker-build.yml
@@ -154,7 +154,7 @@ jobs:
         if: ${{ ! matrix.isPr }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ inputs.build_id }}
+          name: digests-${{ inputs.build_id }}-${{ matrix.arch }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -172,7 +172,7 @@ jobs:
 
       # If this build is NOT a PR and passed in a REDEPLOY_DEMO_URL secret,
       # Then redeploy https://demo.dspace.org if this build is for our deployment architecture and demo branch.
-      - name: Redeploy demo.dspace.org (based on maintenace branch)
+      - name: Redeploy demo.dspace.org (based on maintenance branch)
         if: |
           !matrix.isPR &&
           env.REDEPLOY_DEMO_URL != '' &&
@@ -194,8 +194,10 @@ jobs:
       - name: Download Docker build digests
         uses: actions/download-artifact@v4
         with:
-          name: digests-${{ inputs.build_id }}
           path: /tmp/digests
+          # Download digests for both AMD64 and ARM64 into same directory
+          pattern: digests-${{ inputs.build_id }}-*
+          merge-multiple: true
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3