From c2e365b0006388a0de59c2b00491a4cdef5f1947 Mon Sep 17 00:00:00 2001
From: nerdCopter <56646290+nerdCopter@users.noreply.github.com>
Date: Fri, 6 Sep 2024 08:10:59 -0500
Subject: [PATCH] [github] update actions/upload-artifact and
 actions/download-artifact to v4

---
 .github/workflows/build.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54922794f6..a598023aac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,8 +121,8 @@ jobs:
         echo "Artifact name: ${{ env.ARTIFACT_NAME }}"
         echo "outputs.buildtag: ${{ steps.ids.outputs.buildtag }}"
         echo "outputs.shortsha: ${{ steps.ids.outputs.shortsha }}"
-        echo "outputs.artfact: ${{ steps.ids.outputs.artifact }}"
-        echo "outputs.artfact: ${{ steps.ids.outputs.artifact }}"
+        echo "outputs.artifact: ${{ steps.ids.outputs.artifact }}"
+        echo "outputs.version: ${{ steps.ids.outputs.version }}"
       continue-on-error: true
 
     # Build HEX
@@ -132,9 +132,9 @@ jobs:
 
     # Upload the Builds to ZIP file with existing SHA in .hex names
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.ARTIFACT_NAME }}
+        name: ${{ env.ARTIFACT_NAME }}-${{ matrix.runs-on }}
         path: obj/*.hex
 
 
@@ -157,16 +157,18 @@ jobs:
           echo "Repo: ${{ github.REPOSITORY }}"
           echo "outputs.buildtag: ${{ needs.build.outputs.buildtag }}"
           echo "outputs.shortsha: ${{ needs.build.outputs.shortsha }}"
-          echo "outputs.artfact: ${{ needs.build.outputs.artifact }}"
-          echo "outputs.artfact: ${{ needs.build.outputs.version }}"
+          echo "outputs.artifact: ${{ needs.build.outputs.artifact }}"
+          echo "outputs.version: ${{ needs.build.outputs.version }}"
           echo "NOW=$(date +'%Y%m%d.%H%M%S')" >> $GITHUB_ENV
         continue-on-error: true
 
       - name: download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build.outputs.artifact }} #no name parameter will download all artifacts, but create separate subfolders
           path: obj
+          pattern: ${{ needs.build.outputs.artifact }}-*
+          merge-multiple: true
         continue-on-error: false
 
       - name: list/find extractions