update download step

google · Nov 7, 2023 · 39c8841 · 39c8841
1 parent ccc74d5
commit 39c8841
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -56,12 +56,16 @@ jobs:
         echo "build-key=${{ runner.os }}-${{github.workflow}}-${{ matrix.build_type }}-${{ matrix.c_compiler }}" >> "$GITHUB_OUTPUT"
 
     # Only download workspace artifacts on pull requests. CI builds should start from a fresh state.
-    - uses: actions/download-artifact@v3
+    - name: Download workspace artifacts
+      uses: dawidd6/action-download-artifact@v2
       if: ${{ github.event_name == 'pull_request' }}
-      continue-on-error: true
       with:
+        workflow: ${{ github.workflow }}
+        workflow_conclusion: success
         name: workspace-${{ steps.strings.outputs.build-key }}
+        search_artifacts: true
         path: ${{ github.workspace }}
+        if_no_artifact_found: "warn"
 
     - name: Install Ubuntu build dependencies
       if: matrix.os == 'ubuntu-latest'
@@ -105,7 +109,8 @@ jobs:
         SCCACHE_GHA_ENABLED: "true"
 
     # Always upload workspace artifacts. Eventually only do this for pushes to main.
-    - uses: actions/upload-artifact@v3
+    - name: Upload workspace artifacts
+      uses: actions/upload-artifact@v3
       with:
         name: workspace-${{ steps.strings.outputs.build-key }}
         path: ${{ github.workspace }}

diff --git a/.github/workflows/gn.yml b/.github/workflows/gn.yml
@@ -43,12 +43,16 @@ jobs:
         echo "build-key=${{ runner.os }}-${{github.workflow}}" >> "$GITHUB_OUTPUT"
 
     # Only download workspace artifacts on pull requests. CI builds should start from a fresh state.
-    - uses: actions/download-artifact@v3
+    - name: Download workspace artifacts
+      uses: dawidd6/action-download-artifact@v2
       if: ${{ github.event_name == 'pull_request' }}
-      continue-on-error: true
       with:
+        workflow: ${{ github.workflow }}
+        workflow_conclusion: success
         name: workspace-${{ steps.strings.outputs.build-key }}
+        search_artifacts: true
         path: ${{ github.workspace }}
+        if_no_artifact_found: "warn"
 
     - name: Set up checkout
       run: |
@@ -85,7 +89,8 @@ jobs:
         DEPOT_TOOLS_WIN_TOOLCHAIN: 0
 
     # Always upload workspace artifacts. Eventually only do this for pushes to main.
-    - uses: actions/upload-artifact@v3
+    - name: Upload workspace artifacts
+      uses: actions/upload-artifact@v3
       with:
         name: workspace-${{ steps.strings.outputs.build-key }}
         path: ${{ github.workspace }}