Merge pull request #631 from adafruit/fix-upload-download-artifact

Update Depreciated Workflow Action
adafruit · Oct 10, 2024 · 901e2a4 · 901e2a4
2 parents 6e49411 + d01e5d7
commit 901e2a4
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 44 deletions.
diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build-esp32sx-esptool:
-    name: Build ESP32-Sx
+    name: 🏗️ESP32-Sx(lvgl)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -22,7 +22,7 @@ jobs:
         include:
           - offset: "0x1000"
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -100,7 +100,7 @@ jobs:
           } >> "$GITHUB_OUTPUT"
       - name: Check boot_app0 file existence (esp32sx built from core, not-source)
         id: check_files
-        uses: andstor/file-existence-action@v2
+        uses: andstor/file-existence-action@v3
         with:
           files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
       - name: list arduino esp32 core files
@@ -133,24 +133,24 @@ jobs:
       - name: Zip build artifacts
         run: |
           zip -r wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.*
-      - name: upload build artifacts zip
-        uses: actions/upload-artifact@v3
+      - name: Upload build artifacts zip
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}-zip
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.zip
       - name: Rename build artifacts to reflect the platform name
         run: |
           mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
-      - name: upload build artifacts
-        uses: actions/upload-artifact@v3
+      - name: Upload build artifact UF2 file
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}-uf2
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
 
   build-esp32sx:
-    name: Build ESP32-Sx
+    name: 🏗️ESP32-Sx
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -171,7 +171,7 @@ jobs:
             "qtpy_esp32s3_n4r2",
           ]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -224,15 +224,15 @@ jobs:
           mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
           mv examples/*/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
       - name: upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
 
   build-esp32:
-    name: Build ESP32 and Cx
+    name: 🏗️ESP32/Cx
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -253,7 +253,7 @@ jobs:
           - offset: "0x0"
             arduino-platform: "wippersnapper_feather_esp32c6"
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -303,7 +303,7 @@ jobs:
           mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin
       - name: Check boot_app0 file existence (esp32 built from core, not-source)
         id: check_files
-        uses: andstor/file-existence-action@v2
+        uses: andstor/file-existence-action@v3
         with:
           files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
       - name: boot_app0 file from arduino-cli core
@@ -343,14 +343,14 @@ jobs:
         run: |
           zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.*
       - name: upload build artifacts zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
 
   build-samd:
-    name: Build WipperSnapper SAMD
+    name: 🏗️SAMD
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -362,7 +362,7 @@ jobs:
             "metro_m4_airliftlite_tinyusb",
           ]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -399,22 +399,22 @@ jobs:
           mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
           mv examples/*/build/*/Wippersnapper_demo.ino.hex wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.hex
       - name: upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.hex
 
   build-rp2040:
-    name: Build WipperSnapper RP2040
+    name: 🏗️RP2040
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         arduino-platform: ["picow_rp2040_tinyusb"]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -449,22 +449,22 @@ jobs:
         run: |
           mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
       - name: upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
 
   # NOTE: This does NOT release artifacts, it only builds
   build-samd-non-fs:
-    name: Build WipperSnapper SAMD (NO-TINYUSB)
+    name: 🏗️SAMD🚫⧾🔱
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         arduino-platform: ["mkrwifi1010", "nano_33_iot"]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -497,14 +497,14 @@ jobs:
         run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
 
   build-esp8266:
-    name: Build WipperSnapper ESP8266
+    name: 🏗️ESP8266
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         arduino-platform: ["feather_esp8266"]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -546,14 +546,14 @@ jobs:
         run: |
           zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.*
       - name: upload build artifacts zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files
+          name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
 
   build-esp32sx-dev:
-    name: Build WipperSnapper ESP32-Sx DEV BUILDS
+    name: 🏗️ESP32-Sx(DEV)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -567,7 +567,7 @@ jobs:
             "feather_esp32s3_tft_debug",
           ]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -620,15 +620,15 @@ jobs:
           mv examples/*/build/*/wippersnapper_debug.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
           mv examples/*/build/*/wippersnapper_debug.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
       - name: upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files-dev
+          name: build-files-dev-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
             wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
 
   build-esp32-dev:
-    name: Build WipperSnapper ESP32/Cx DEV BUILDS
+    name: 🏗️ESP32/Cx(DEV)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -642,7 +642,7 @@ jobs:
           - offset: "0x0"
             arduino-platform: "wippersnapper_feather_esp32c6_debug"
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4
@@ -692,7 +692,7 @@ jobs:
           mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin
       - name: Check boot_app0 file existence (esp32 built from core, not-source)
         id: check_files
-        uses: andstor/file-existence-action@v2
+        uses: andstor/file-existence-action@v3
         with:
           files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
       - name: boot_app0 file from arduino-cli core
@@ -734,14 +734,40 @@ jobs:
         run: |
           zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.*
       - name: upload build artifacts zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build-files-dev
+          name: build-files-dev-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
           path: |
             wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
 
+  merge-job-build-files:
+    name: Merge Artifacts for build-files
+    runs-on: ubuntu-latest
+    needs: [build-esp32sx-esptool, build-esp32sx, build-esp32, build-esp8266, build-samd, build-rp2040, build-samd-non-fs]
+
+    steps:
+      - name: Merge Artifacts from Builds
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: build-files
+          pattern: build-files-!(dev)-*
+          delete-merged: true
+
+  merge-job2:
+    name: Merge Artifacts for build-files-dev
+    runs-on: ubuntu-latest
+    needs: [build-esp32sx-dev, build-esp32-dev]
+
+    steps:
+      - name: Merge Artifacts from Dev Builds
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: build-files-dev
+          pattern: build-files-dev-*
+          delete-merged: true
 
   clang_and_doxy:
+    name: 🔎Clang & Doxygen
     runs-on: ubuntu-latest
     needs:
       [
@@ -753,7 +779,7 @@ jobs:
         build-rp2040,
       ]
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - uses: actions/checkout@v4

diff --git a/.github/workflows/release-callee.yml b/.github/workflows/release-callee.yml
@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download build artifacts from build-platform steps
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: build-files
+          path: .
       - name: List Files
         run: ls
       - name: Upload Assets to the GitHub Release