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

jfrog · Sep 26, 2024 · 3edfa27 · 3edfa27
2 parents fc7def7 + be39e19
commit 3edfa27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -19,7 +19,7 @@ jobs:
       - name: "CLA Assistant"
         if: ${{ steps.sign-or-recheck.outputs.match != '' || github.event_name == 'pull_request_target' }}
         # Alpha Release
-        uses: cla-assistant/github-action@v2.3.0
+        uses: cla-assistant/github-action@v2.6.0
         env:
           # Generated and maintained by GitHub
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/jas/common.go b/jas/common.go
@@ -55,6 +55,9 @@ func CreateJasScanner(serverDetails *config.ServerDetails, validateSecrets bool,
 		if len(serverDetails.XrayUrl) != 0 {
 			log.Debug("Xray URL provided without platform URL")
 		}
+		if len(serverDetails.ArtifactoryUrl) != 0 {
+			log.Debug("Artifactory URL provided without platform URL")
+		}
 		log.Warn(NoServerUrlWarn)
 		return
 	}