Fall back to gzip if zstd fails

github · Sep 23, 2024 · 4d015b8 · 4d015b8
1 parent 662c71a
commit 4d015b8
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 33 deletions.
diff --git a/lib/setup-codeql.js b/lib/setup-codeql.js
diff --git a/lib/setup-codeql.js.map b/lib/setup-codeql.js.map
diff --git a/lib/setup-codeql.test.js b/lib/setup-codeql.test.js
diff --git a/lib/setup-codeql.test.js.map b/lib/setup-codeql.test.js.map
diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts
@@ -6,7 +6,6 @@ import * as sinon from "sinon";
 import * as actionsUtil from "./actions-util";
 import { getRunnerLogger } from "./logging";
 import * as setupCodeql from "./setup-codeql";
-import { ZstdAvailability } from "./tar";
 import {
   LINKED_CLI_VERSION,
   LoggedMessage,
@@ -91,7 +90,7 @@ test("getCodeQLSource sets CLI version for a semver tagged bundle", async (t) =>
       SAMPLE_DEFAULT_CLI_VERSION,
       SAMPLE_DOTCOM_API_DETAILS,
       GitHubVariant.DOTCOM,
-      getStubZstdAvailability(),
+      false,
       createFeatures([]),
       getRunnerLogger(true),
     );
@@ -109,7 +108,7 @@ test("getCodeQLSource correctly returns bundled CLI version when tools == linked
       SAMPLE_DEFAULT_CLI_VERSION,
       SAMPLE_DOTCOM_API_DETAILS,
       GitHubVariant.DOTCOM,
-      getStubZstdAvailability(),
+      false,
       createFeatures([]),
       getRunnerLogger(true),
     );
@@ -130,7 +129,7 @@ test("getCodeQLSource correctly returns bundled CLI version when tools == latest
       SAMPLE_DEFAULT_CLI_VERSION,
       SAMPLE_DOTCOM_API_DETAILS,
       GitHubVariant.DOTCOM,
-      getStubZstdAvailability(),
+      false,
       createFeatures([]),
       logger,
     );
@@ -246,9 +245,3 @@ test("setupCodeQLBundle logs the CodeQL CLI version being used when asked to dow
     );
   });
 });
-
-function getStubZstdAvailability(): ZstdAvailability {
-  return {
-    available: false,
-  };
-}