From 331d95e7d6066bcdf086873674f1cbcd5373745b Mon Sep 17 00:00:00 2001
From: tchapi <cyril.chapellier@alan.eu>
Date: Sun, 10 Mar 2024 00:13:17 +0100
Subject: [PATCH] Fix Workflow

---
 .github/workflows/main.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43a00af..8786f0a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,14 +18,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        image:
+          - davis
+          - davis-standalone
         platform:
           - linux/amd64
           - linux/arm64
         include:
-          - dockerfile: docker/Dockerfile
-            image: davis
-          - dockerfile: docker/Dockerfile-standalone
-            image: davis-standalone
+          - image: davis
+            dockerfile: docker/Dockerfile
+          - image: davis-standalone
+            dockerfile: docker/Dockerfile-standalone
     steps:
       -
         name: Prepare
@@ -77,15 +80,15 @@ jobs:
       -
         name: Export digest
         run: |
-          mkdir -p /tmp/digests
+          mkdir -p /tmp/digests/${{ matrix.image }}
           digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"          
+          touch "/tmp/digests/${{ matrix.image }}/${digest#sha256:}"          
       -
         name: Upload digest
         uses: actions/upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
+          path: /tmp/digests/${{ matrix.image }}/*
           if-no-files-found: error
           retention-days: 1
 
@@ -109,7 +112,7 @@ jobs:
         name: Download digests
         uses: actions/download-artifact@v4
         with:
-          path: /tmp/digests
+          path: /tmp/digests/${{ matrix.image }}
           pattern: digests-*
           merge-multiple: true
       -
@@ -139,7 +142,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Create manifest list and push
-        working-directory: /tmp/digests
+        working-directory: /tmp/digests/${{ matrix.image }}
         run: |
           docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \