Merge remote-tracking branch 'upstream/dev' into add_recursive_audit

jfrog · Oct 25, 2023 · 580b13b · 580b13b
2 parents cc693ba + 3db83b2
commit 580b13b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml
@@ -27,10 +27,17 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.20.x
-      - name: Setup Python3
+      - name: Setup Python3 in Ubuntu/MacOS
         uses: actions/setup-python@v4
         with:
           python-version: "3.x"
+        if: runner.os != 'Windows'
+      # Due to a bug in Python 3.12.0 in Windows we temporary use version 3.11.5
+      - name: Setup Python3 in Windows
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11.5"
+        if: runner.os == 'Windows'
       - name: Setup Pipenv
         if: ${{ matrix.suite == 'pipenv' }}
         run: python -m pip install pipenv

diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml
@@ -72,14 +72,26 @@ jobs:
           ./jf${{ matrix.suite.osSuffix }} --version
         if: ${{ matrix.suite.os == 'windows' }}
 
+      # Prior to the release, we set the new version in the package.json files, introducing the prereleased version. 
+      # This adjustment may result in an attempt to download a version that hasn't been published to releases.jfrog.io yet. 
+      # To handle it, we fetch the most recent JFrog CLI release and store it in the LATEST_RELEASE step output.
+      - name: "Get latest release"
+        id: latest-release
+        run: |
+         export LATEST_RELEASE=`curl https://api.github.com/repos/jfrog/jfrog-cli/releases/latest -s | jq .name -r | cut -c 2-`
+         echo "LATEST_RELEASE=$LATEST_RELEASE" >> "$GITHUB_OUTPUT"
+        shell: bash
+
       - name: Test install npm - v2
         working-directory: build/npm/v2
         run: |
+          npm version ${{ steps.latest-release.outputs.LATEST_RELEASE }} --allow-same-version
           npm install
           ./bin/jfrog${{ matrix.suite.osSuffix }} --version
 
       - name: Test install npm - v2-jf
         working-directory: build/npm/v2-jf
         run: |
+          npm version ${{ steps.latest-release.outputs.LATEST_RELEASE }} --allow-same-version
           npm install
           ./bin/jf${{ matrix.suite.osSuffix }} --version