From a88b43bbba325149eaf49c467fd4be49c9dee7db Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Tue, 24 Sep 2024 09:50:06 -0700
Subject: [PATCH] fix

---
 .github/workflows/upload-to-jfrog.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml
index 344310dfc..9f69dce34 100644
--- a/.github/workflows/upload-to-jfrog.yml
+++ b/.github/workflows/upload-to-jfrog.yml
@@ -41,12 +41,13 @@ jobs:
       run: echo JFROG_BUILD_OPTS="--build-name python-client --build-number ${{ inputs.version }}" >> $GITHUB_ENV
 
     - name: Choose folder to upload artifacts to
-      run: echo REPO_FOLDER_PATH="${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME && format('aerospike/{0}', inputs.version) || github.ref_name }}/" >> $GITHUB_ENV
+      run: echo REPO_FOLDER_PATH="${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME && format('aerospike/{0}/{1}', inputs.version, env.ARTIFACT_FOLDER_PATH) || github.ref_name }}/" >> $GITHUB_ENV
 
     - name: Upload artifacts to JFrog
       # Source path must be in quotes if it contains an asterisk
       # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551
-      run: jf rt upload ${{ env.JFROG_BUILD_OPTS }} "${{ env.ARTIFACT_FOLDER_PATH }}/*" ${{ inputs.jfrog-repo-name }}/${{ env.REPO_FOLDER_PATH }}
+      run: jf rt upload ${{ env.JFROG_BUILD_OPTS }} "*" ${{ inputs.jfrog-repo-name }}/${{ env.REPO_FOLDER_PATH }}
+      working-directory: ${{ env.ARTIFACT_FOLDER_PATH }}
 
     - name: Publish build info
       if: ${{ env.JFROG_BUILD_OPTS != '' }}