Do not attempt to install zstd bundles yet

We will revert this commit and add a version check once the first stable release with an zstd bundle is available.
This commit is contained in:
Henry Mercer
2024-08-23 16:30:32 +01:00
parent 73da3732dc
commit 3bf847063c
3 changed files with 6 additions and 59 deletions

22
lib/setup-codeql.js generated
View File

@@ -48,7 +48,6 @@ const api = __importStar(require("./api-client"));
// creation scripts. Ensure that any changes to the format of this file are compatible with both of
// these dependents.
const defaults = __importStar(require("./defaults.json"));
const feature_flags_1 = require("./feature-flags");
const tar = __importStar(require("./tar"));
const util = __importStar(require("./util"));
const util_1 = require("./util");
@@ -508,27 +507,10 @@ async function setupCodeQLBundleWithZstdOption(toolsInput, apiDetails, tempDir,
*
* @returns the path to the extracted bundle, and the version of the tools
*/
async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger) {
let zstdError = undefined;
async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, _features, logger) {
const availableResult = await tar.isZstdAvailable(logger);
if (!toolsInput && (await features.getValue(feature_flags_1.Feature.ZstdBundle))) {
try {
if (availableResult.available) {
return await setupCodeQLBundleWithZstdOption(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, true, logger);
}
else {
logger.debug("Falling back to bundle compressed using gzip because the available version of tar was not " +
"recognized or is too old.");
}
}
catch (e) {
logger.info("Failed to set up bundle compressed using zstd, falling back to bundle compressed using gzip.");
logger.debug(`Underlying error: ${e}`);
zstdError = e;
}
}
const result = await setupCodeQLBundleWithZstdOption(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, false, logger);
result.toolsDownloadStatusReport = Object.assign({}, result.toolsDownloadStatusReport, { tarVersion: availableResult.version }, zstdError ? { zstdError: (0, util_1.wrapError)(zstdError).message } : {});
result.toolsDownloadStatusReport = Object.assign({}, result.toolsDownloadStatusReport, { tarVersion: availableResult.version });
return result;
}
async function cleanUpGlob(glob, name, logger) {