gha: Switched to standard da for cross-workflow downloads

Looks like cross-workflow downloads has finally been added to the standard download-artifact action, so we might as well switch to it to reduce dependencies. dawidd6's version was also missing the merge-multiple feature which is necessary to work around breaking changes in download-artifact's v4 bump. Weirdly it needs GITHUB_TOKEN for some reason? Not sure why this couldn't be implicit.
littlefs-project · Sep 20, 2024 · 7db9e16 · 7db9e16
1 parent 2c4b262
commit 7db9e16
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,27 +30,27 @@ jobs:
           fetch-depth: 0
 
       # try to get results from tests
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: actions/download-artifact@v4.1.8
         continue-on-error: true
         with:
-          workflow: ${{github.event.workflow_run.name}}
-          run_id: ${{github.event.workflow_run.id}}
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          run-id: ${{github.event.workflow_run.id}}
           pattern: '{sizes,sizes-*}'
           merge-multiple: true
           path: sizes
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: actions/download-artifact@v4.1.8
         continue-on-error: true
         with:
-          workflow: ${{github.event.workflow_run.name}}
-          run_id: ${{github.event.workflow_run.id}}
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          run-id: ${{github.event.workflow_run.id}}
           pattern: '{cov,cov-*}'
           merge-multiple: true
           path: cov
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: actions/download-artifact@v4.1.8
         continue-on-error: true
         with:
-          workflow: ${{github.event.workflow_run.name}}
-          run_id: ${{github.event.workflow_run.id}}
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          run-id: ${{github.event.workflow_run.id}}
           pattern: '{bench,bench-*}'
           merge-multiple: true
           path: bench

diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml
@@ -13,11 +13,11 @@ jobs:
   status:
     runs-on: ubuntu-latest
     steps:
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: actions/download-artifact@v4.1.8
         continue-on-error: true
         with:
-          workflow: ${{github.event.workflow_run.name}}
-          run_id: ${{github.event.workflow_run.id}}
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          run-id: ${{github.event.workflow_run.id}}
           pattern: '{status,status-*}'
           merge-multiple: true
           path: status
@@ -68,11 +68,11 @@ jobs:
 
     steps:
       # generated comment?
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: actions/download-artifact@v4.1.8
         continue-on-error: true
         with:
-          workflow: ${{github.event.workflow_run.name}}
-          run_id: ${{github.event.workflow_run.id}}
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          run-id: ${{github.event.workflow_run.id}}
           pattern: '{comment,comment-*}'
           merge-multiple: true
           path: comment