updated jfrog upload section

netfoundry · Dec 4, 2024 · 7f9238e · 7f9238e
1 parent 14436fe
commit 7f9238e
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -322,22 +322,22 @@ jobs:
       - name: Configure jFrog CLI
         if: ${{ matrix.pkg_type == 'deb'}}
         uses: jfrog/setup-jfrog-cli@v4
-        env:
-          JF_USER: ${{ secrets.JF_USER }}
-          JF_PASSWORD: ${{ secrets.JF_PASSWORD }}
       - name: Upload DEB to Artifactory with jFrog CLI
         if: ${{ matrix.pkg_type == 'deb'}}
         env:
           GH_TOKEN: ${{ github.token }}
+          JF_USER: ${{ secrets.JF_USER }}
+          JF_PASSWORD: ${{ secrets.JF_PASSWORD }}
         shell: bash
         run: |
           asset=$(gh api /repos/netfoundry/zfw/releases --jq '( last ((.[].assets | sort_by(.created_at)).[] | select(.name=="${{ env.APP_NAME }}-router-${{ needs.build_amd64_release.outputs.version }}.${{ matrix.goarch }}.${{ matrix.pkg_type }}"))))')
           curl -Ls  "$(jq -r .browser_download_url <<< "$asset")" -H "Accept: application/vnd.github.v3+json" --output ./"$(jq -r .name <<< "$asset")"
-          ls -l ./
           jf rt upload
-          ./${{ env.APP_NAME }}-router-${{ needs.build_amd64_release.outputs.version }}.${{ matrix.goarch }}.${{ matrix.pkg_type }} /
-          netfoundry-deb-stable/pool/zfw-router/${{ matrix.distro_name }}/${{ matrix.goarch }} /
-          --deb=${{ matrix.distro_name }}/main/${{ matrix.goarch }} /
-          --url https://netfoundry.jfrog.io/artifactory/ /
-          --recursive=false /
-          --flat=true 
+              ./${{ env.APP_NAME }}-router-${{ needs.build_amd64_release.outputs.version }}.${{ matrix.goarch }}.${{ matrix.pkg_type }} \
+              netfoundry-deb-stable/pool/${{ env.APP_NAME }}-router/${{ matrix.distro_name }}/${{ matrix.goarch }}/ \
+              --url https://netfoundry.jfrog.io/artifactory/ \
+              --user ${{ secrets.JF_USER}} \
+              --password ${{ secrets.JF_PASSWORD }} \
+              --deb=${{ matrix.distro_name }}/main/${{ matrix.goarch }} \
+              --recursive=false \
+              --flat=true