Gate zstd enablement on tar version

lib/feature-flags.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Features = exports.FEATURE_FLAGS_FILE_NAME = exports.featureConfig = exports.Feature = exports.CODEQL_VERSION_FINE_GRAINED_PARALLELISM = void 0;
-exports.useZstdBundle = useZstdBundle;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const semver = __importStar(require("semver"));
@@ -349,8 +348,4 @@ class GitHubFeatureFlags {
         }
     }
 }
-async function useZstdBundle(cliVersion, features) {
-    return (semver.gte(cliVersion, "2.19.0") &&
-        !!(await features.getValue(Feature.ZstdBundle)));
-}
 //# sourceMappingURL=feature-flags.js.map

lib/setup-codeql.js

@@ -340,7 +340,8 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
         }
     }
     if (!url) {
-        url = await getCodeQLBundleDownloadURL(tagName, apiDetails, cliVersion !== undefined && (await (0, feature_flags_1.useZstdBundle)(cliVersion, features)), logger);
+        url = await getCodeQLBundleDownloadURL(tagName, apiDetails, cliVersion !== undefined &&
+            (await useZstdBundle(cliVersion, features, logger)), logger);
     }
     if (cliVersion) {
         logger.info(`Using CodeQL CLI version ${cliVersion} sourced from ${url}.`);
@@ -530,4 +531,9 @@ function sanitizeUrlForStatusReport(url) {
         ? url
         : "sanitized-value";
 }
+async function useZstdBundle(cliVersion, features, logger) {
+    return (semver.gte(cliVersion, "2.19.0") &&
+        !!(await features.getValue(feature_flags_1.Feature.ZstdBundle)) &&
+        (await tar.isZstdAvailable(logger)).available);
+}
 //# sourceMappingURL=setup-codeql.js.map

src/feature-flags.ts

@@ -499,13 +499,3 @@ class GitHubFeatureFlags {
     }
   }
 }
-
-export async function useZstdBundle(
-  cliVersion: string,
-  features: FeatureEnablement,
-): Promise<boolean> {
-  return (
-    semver.gte(cliVersion, "2.19.0") &&
-    !!(await features.getValue(Feature.ZstdBundle))
-  );
-}

src/setup-codeql.ts

@@ -17,8 +17,8 @@ import * as api from "./api-client";
 import * as defaults from "./defaults.json";
 import {
   CodeQLDefaultVersionInfo,
+  Feature,
   FeatureEnablement,
-  useZstdBundle,
 } from "./feature-flags";
 import { Logger } from "./logging";
 import * as tar from "./tar";
@@ -439,7 +439,8 @@ export async function getCodeQLSource(
     url = await getCodeQLBundleDownloadURL(
       tagName!,
       apiDetails,
-      cliVersion !== undefined && (await useZstdBundle(cliVersion, features)),
+      cliVersion !== undefined &&
+        (await useZstdBundle(cliVersion, features, logger)),
       logger,
     );
   }
@@ -741,3 +742,15 @@ function sanitizeUrlForStatusReport(url: string): string {
     ? url
     : "sanitized-value";
 }
+
+async function useZstdBundle(
+  cliVersion: string,
+  features: FeatureEnablement,
+  logger: Logger,
+): Promise<boolean> {
+  return (
+    semver.gte(cliVersion, "2.19.0") &&
+    !!(await features.getValue(Feature.ZstdBundle)) &&
+    (await tar.isZstdAvailable(logger)).available
+  );
+}