Merge pull request #1517 from pi-hole/artifacts

Artifacts v4
pi-hole · Jan 6, 2024 · 0c9e8ee · 0c9e8ee
2 parents 174a39f + 0ba8648
commit 0c9e8ee
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -27,6 +27,11 @@ jobs:
             platform: linux/riscv64
             alpine_version: edge
     steps:
+      - name: Prepare name for digest up/download
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
       - name: Checkout Repo
         uses: actions/checkout@v4
 
@@ -77,9 +82,9 @@ jobs:
           touch "/tmp/digests/${{ matrix.registry }}/${digest_docker#sha256:}"
 
       - name: Upload digest
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: digests
+          name: digests-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -100,11 +105,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download digests
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: digests
           path: /tmp/digests
-
+          pattern: digests-*
+          merge-multiple: true
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3