🐛 Add --skip-pull only with containers

JetBrains · Aug 4, 2023 · fd44f48 · fd44f48
1 parent e47179c
commit fd44f48
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/common/qodana.ts b/common/qodana.ts
@@ -136,12 +136,14 @@ export function getQodanaScanArgs(
 ): string[] {
   const cliArgs: string[] = [
     'scan',
-    '--skip-pull',
     '--cache-dir',
     cacheDir,
     '--results-dir',
     resultsDir
   ]
+  if (!isNativeMode(args)) {
+    cliArgs.push('--skip-pull')
+  }
   if (args) {
     cliArgs.push(...args)
   }

diff --git a/scan/__tests__/main.test.ts b/scan/__tests__/main.test.ts
@@ -169,11 +169,11 @@ export function inputsDefaultFixture(): Inputs {
 export function defaultDockerRunCommandFixture(): string[] {
   return [
     'scan',
-    '--skip-pull',
     '--cache-dir',
     '${{ runner.temp }}/qodana-caches',
     '--results-dir',
     '${{ runner.temp }}/qodana-results',
+    '--skip-pull',
     '--baseline',
     'qodana.sarif.json'
   ]

diff --git a/scan/dist/index.js b/scan/dist/index.js
@@ -8628,12 +8628,14 @@ function getQodanaPullArgs(args) {
 function getQodanaScanArgs(args, resultsDir, cacheDir) {
   const cliArgs = [
     "scan",
-    "--skip-pull",
     "--cache-dir",
     cacheDir,
     "--results-dir",
     resultsDir
   ];
+  if (!isNativeMode(args)) {
+    cliArgs.push("--skip-pull");
+  }
   if (args) {
     cliArgs.push(...args);
   }

diff --git a/vsts/QodanaScan/index.js b/vsts/QodanaScan/index.js
@@ -144,12 +144,14 @@ function getQodanaPullArgs(args) {
 function getQodanaScanArgs(args, resultsDir, cacheDir) {
   const cliArgs = [
     "scan",
-    "--skip-pull",
     "--cache-dir",
     cacheDir,
     "--results-dir",
     resultsDir
   ];
+  if (!isNativeMode(args)) {
+    cliArgs.push("--skip-pull");
+  }
   if (args) {
     cliArgs.push(...args);
   }