Merge pull request LedgerHQ#79 from LedgerHQ/fbe/bump_actions/upload-…

…artifact_action_to_v4 Bump actions/upload-artifact@v3 to actions/upload-artifact@v4
lightsail-network · Jun 19, 2024 · c8d599f · c8d599f
2 parents 030a3f6 + ea3071b
commit c8d599f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/_check_app_load_params.yml b/.github/workflows/_check_app_load_params.yml
@@ -33,7 +33,7 @@ jobs:
           ref: main
 
       - name: Download manifest
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.download_manifest_artifact_name }}
           path: ${{ inputs.download_manifest_artifact_name }}

diff --git a/.github/workflows/_check_clang_static_analyzer.yml b/.github/workflows/_check_clang_static_analyzer.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Upload scan result
         if: failure() && ${{ inputs.is_rust == 'false'}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: scan-build
           path: scan-build
diff --git a/.github/workflows/_check_clang_static_analyzer_latest_sdk.yml b/.github/workflows/_check_clang_static_analyzer_latest_sdk.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Upload scan result
         if: failure() && ${{ inputs.is_rust == 'false'}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: scan-build
           path: scan-build
diff --git a/.github/workflows/_check_icons.yml b/.github/workflows/_check_icons.yml
@@ -43,7 +43,7 @@ jobs:
           submodules: recursive
 
       - name: Download manifest
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.download_manifest_artifact_name }}
           path: ${{ inputs.download_manifest_artifact_name }}

diff --git a/.github/workflows/_check_makefile.yml b/.github/workflows/_check_makefile.yml
@@ -43,7 +43,7 @@ jobs:
           submodules: recursive
 
       - name: Download manifest
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.download_manifest_artifact_name }}
           path: ${{ inputs.download_manifest_artifact_name }}

diff --git a/.github/workflows/_get_app_manifest.yml b/.github/workflows/_get_app_manifest.yml
@@ -70,7 +70,7 @@ jobs:
               --json_path ../manifest_${{ matrix.device }}.json
 
       - name: Upload app manifest
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.upload_manifest_artifact_name }}
           path: ./manifest_*.json

diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
@@ -117,8 +117,20 @@ jobs:
 
       - name: Upload app binary
         if: ${{ inputs.upload_app_binaries_artifact != '' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.upload_app_binaries_artifact }}
+          name: ${{ inputs.upload_app_binaries_artifact }}-${{ matrix.device }}
           path: ${{ steps.build.outputs.binary_path }}
           if-no-files-found: error
+
+  merge_artifacts:
+    name: Merge build artifacts
+    needs: build
+    runs-on: ubuntu-latest
+    if: ${{ inputs.upload_app_binaries_artifact != '' }}
+    steps:
+      - uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{ inputs.upload_app_binaries_artifact }}
+          pattern: ${{ inputs.upload_app_binaries_artifact }}-*
+          delete-merged: true
diff --git a/.github/workflows/reusable_ragger_tests.yml b/.github/workflows/reusable_ragger_tests.yml
@@ -119,7 +119,7 @@ jobs:
           fi
 
       - name: Download app binaries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.download_app_binaries_artifact }}
           path: ${{ steps.set_binary_path.outputs.binary_path }}
@@ -129,7 +129,7 @@ jobs:
 
       - name: Download additional app binaries if required
         if: ${{ inputs.additional_app_binaries_artifact != '' }}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.additional_app_binaries_artifact }}
           path: ${{ inputs.additional_app_binaries_artifact_dir }}
@@ -140,7 +140,7 @@ jobs:
 
       - name: Download additional lib binaries if required
         if: ${{ inputs.lib_binaries_artifact != '' }}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.lib_binaries_artifact }}
           path: ${{ needs.call_get_app_metadata.outputs.pytest_directory }}/lib_binaries/
@@ -164,7 +164,7 @@ jobs:
 
       - name: Upload snapshots
         if: ${{ failure() && inputs.upload_snapshots_on_failure == true }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device }}-tests-snapshots
           path: ${{ needs.call_get_app_metadata.outputs.pytest_directory }}/snapshots-tmp/${{ matrix.device }}