From f2b21646637e52d814ac1ca14fe0d7d1bddce9c6 Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Mon, 24 Jun 2024 10:09:12 -0700
Subject: [PATCH] Fix

---
 .../get-artifact-for-stage-tests/action.yml   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/actions/get-artifact-for-stage-tests/action.yml b/.github/actions/get-artifact-for-stage-tests/action.yml
index 36a2fe136..6a166677e 100644
--- a/.github/actions/get-artifact-for-stage-tests/action.yml
+++ b/.github/actions/get-artifact-for-stage-tests/action.yml
@@ -54,25 +54,25 @@ runs:
     with:
       name: ${{ env.GITHUB_ARTIFACT_NAME }}
 
-  # End codepath that downloads artifacts from Github
-  # Begin codepath that downloads from JFrog
-
-  - uses: jfrog/setup-jfrog-cli@v4
-    if: ${{ inputs.get_from_jfrog == 'true' }}
-    env:
-      JF_URL: ${{ inputs.JFROG_PLATFORM_URL }}
-      JF_ACCESS_TOKEN: ${{ inputs.JFROG_ACCESS_TOKEN }}
+  # We need the file name pattern to install the artifact using pip later
 
   - name: 'Using JFrog: Get file name glob pattern for sdist'
-    if: ${{ inputs.get_from_jfrog == 'true' && inputs.dist_type_to_get == 'sdist' }}
     run: echo "ARTIFACT_FILE_NAME_PATTERN=*.tar.gz" >> $GITHUB_ENV
     shell: bash
 
   - name: 'Using JFrog: Get file name glob pattern for wheel'
-    if: ${{ inputs.get_from_jfrog == 'true' && inputs.dist_type_to_get == 'wheel' }}
     run: echo "ARTIFACT_FILE_NAME_PATTERN=*${{ env.PYTHON_TAG }}*${{ inputs.wheel_os }}*${{ inputs.wheel_cpu_arch }}.whl" >> $GITHUB_ENV
     shell: bash
 
+  # End codepath that downloads artifacts from Github
+  # Begin codepath that downloads from JFrog
+
+  - uses: jfrog/setup-jfrog-cli@v4
+    if: ${{ inputs.get_from_jfrog == 'true' }}
+    env:
+      JF_URL: ${{ inputs.JFROG_PLATFORM_URL }}
+      JF_ACCESS_TOKEN: ${{ inputs.JFROG_ACCESS_TOKEN }}
+
   - name: Download artifact from JFrog
     if: ${{ inputs.get_from_jfrog == 'true' }}
     run: jf rt dl --fail-no-op --flat --build python-client/${{ inputs.jfrog_build_version }} "${{ inputs.JFROG_REPO_NAME }}/**/${{ env.ARTIFACT_FILE_NAME_PATTERN }}"