From 39c884124f51a846d053042a81eb416df97a0575 Mon Sep 17 00:00:00 2001
From: Austin Eng <2154796+austinEng@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:30:39 -0800
Subject: [PATCH] update download step

---
 .github/workflows/cmake.yml | 11 ++++++++---
 .github/workflows/gn.yml    | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 76f8dde338e..02e2263a0fa 100644
--- 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
index df98dbe0e7f..56bb508f3ec 100644
--- 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 }}