github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-05-23 22:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: refresh js files

Browse Source
This commit is contained in:
Chuan-kai Lin
2025-09-25 14:07:37 -07:00
parent f29462d017
commit d471ff982f
10 changed files with 753 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/analyze-action-post.js
Generated
+59 -58
View File
@@ -24984,11 +24984,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse2();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -25195,8 +25195,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -26033,7 +26033,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -26044,12 +26044,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26347,7 +26347,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse2();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26385,7 +26385,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -29974,8 +29974,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31085,7 +31085,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs7 = __importStar4(require("fs"));
var path6 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants7();
var versionSalt = "1.0";
@@ -31182,7 +31182,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core14.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -73493,7 +73493,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os = require("os");
var cp = require("child_process");
@@ -73507,7 +73507,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -73516,7 +73516,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -73746,7 +73746,7 @@ var require_tool_cache = __commonJS({
var os = __importStar4(require("os"));
var path6 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -74020,7 +74020,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source dir: ${sourceDir}`);
@@ -74039,7 +74039,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source file: ${sourceFile}`);
@@ -74070,7 +74070,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path6.join(_getCacheDirectory(), toolName, versionSpec, arch);
core14.debug(`checking cache: ${cachePath}`);
if (fs7.existsSync(cachePath) && fs7.existsSync(`${cachePath}.complete`)) {
@@ -74154,7 +74154,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path6.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path6.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
core14.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io6.rmRF(folderPath);
@@ -74164,31 +74164,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch) {
const folderPath = path6.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path6.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
const markerPath = `${folderPath}.complete`;
fs7.writeFileSync(markerPath, "");
core14.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core14.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core14.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core14.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core14.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -81746,7 +81746,7 @@ var require_stream_writable = __commonJS({
pna.nextTick(cb, er);
}
function validChunk(stream, state, chunk, cb) {
var valid3 = true;
var valid4 = true;
var er = false;
if (chunk === null) {
er = new TypeError("May not write null values to stream");
@@ -81756,9 +81756,9 @@ var require_stream_writable = __commonJS({
if (er) {
stream.emit("error", er);
pna.nextTick(cb, er);
valid3 = false;
valid4 = false;
}
return valid3;
return valid4;
}
Writable.prototype.write = function(chunk, encoding, cb) {
var state = this._writableState;
@@ -117903,6 +117903,7 @@ async function isAnalyzingDefaultBranch() {
var fs2 = __toESM(require("fs"));
var path2 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -118052,20 +118053,20 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) {
// src/setup-codeql.ts
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// src/tar.ts
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
// src/tools-download.ts
var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
// src/tracer-config.ts
lib/analyze-action.js
Generated
+79 -74
View File
@@ -30833,11 +30833,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse4();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -31044,8 +31044,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -31128,7 +31128,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -31882,7 +31882,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -31893,12 +31893,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -32078,12 +32078,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -32092,11 +32092,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -32104,7 +32104,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -32116,9 +32116,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -32139,29 +32139,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -32196,7 +32196,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse4();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -32211,7 +32211,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -32234,7 +32234,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -35823,8 +35823,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -36934,7 +36934,7 @@ var require_cacheUtils = __commonJS({
var crypto2 = __importStar4(require("crypto"));
var fs20 = __importStar4(require("fs"));
var path20 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants10();
var versionSalt = "1.0";
@@ -37031,7 +37031,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core15.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -79342,7 +79342,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os5 = require("os");
var cp = require("child_process");
@@ -79356,7 +79356,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -79365,7 +79365,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -79595,7 +79595,7 @@ var require_tool_cache = __commonJS({
var os5 = __importStar4(require("os"));
var path20 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream2 = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -79869,7 +79869,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os5.arch();
core15.debug(`Caching tool ${tool} ${version} ${arch2}`);
core15.debug(`source dir: ${sourceDir}`);
@@ -79888,7 +79888,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os5.arch();
core15.debug(`Caching tool ${tool} ${version} ${arch2}`);
core15.debug(`source file: ${sourceFile}`);
@@ -79919,7 +79919,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path20.join(_getCacheDirectory(), toolName, versionSpec, arch2);
core15.debug(`checking cache: ${cachePath}`);
if (fs20.existsSync(cachePath) && fs20.existsSync(`${cachePath}.complete`)) {
@@ -80003,7 +80003,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path20.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
core15.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io7.rmRF(folderPath);
@@ -80013,31 +80013,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch2) {
const folderPath = path20.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
const markerPath = `${folderPath}.complete`;
fs20.writeFileSync(markerPath, "");
core15.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core15.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core15.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core15.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core15.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -82142,16 +82142,16 @@ var require_attribute = __commonJS({
var result = new ValidatorResult(instance, schema2, options, ctx);
var self2 = this;
schema2.allOf.forEach(function(v, i) {
var valid3 = self2.validateSchema(instance, v, options, ctx);
if (!valid3.valid) {
var valid4 = self2.validateSchema(instance, v, options, ctx);
if (!valid4.valid) {
var id = v.$id || v.id;
var msg = id || v.title && JSON.stringify(v.title) || v["$ref"] && "<" + v["$ref"] + ">" || "[subschema " + i + "]";
result.addError({
name: "allOf",
argument: { id: msg, length: valid3.errors.length, valid: valid3 },
message: "does not match allOf schema " + msg + " with " + valid3.errors.length + " error[s]:"
argument: { id: msg, length: valid4.errors.length, valid: valid4 },
message: "does not match allOf schema " + msg + " with " + valid4.errors.length + " error[s]:"
});
result.importErrors(valid3);
result.importErrors(valid4);
}
});
return result;
@@ -82440,8 +82440,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMinimum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance > schema2.exclusiveMinimum;
if (!valid3) {
var valid4 = instance > schema2.exclusiveMinimum;
if (!valid4) {
result.addError({
name: "exclusiveMinimum",
argument: schema2.exclusiveMinimum,
@@ -82454,8 +82454,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMaximum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance < schema2.exclusiveMaximum;
if (!valid3) {
var valid4 = instance < schema2.exclusiveMaximum;
if (!valid4) {
result.addError({
name: "exclusiveMaximum",
argument: schema2.exclusiveMaximum,
@@ -91331,6 +91331,7 @@ var crypto = __toESM(require("crypto"));
var fs8 = __toESM(require("fs"));
var path9 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -91515,12 +91516,16 @@ async function getCacheSaveKey(config, codeQlVersion, checkoutPath) {
}
async function getCacheRestoreKeyPrefix(config, codeQlVersion) {
const languages = [...config.languages].sort().join("_");
const workflowPrefix = await getCacheWorkflowKeyPrefix();
return `${workflowPrefix}${languages}-${codeQlVersion}-`;
}
async function getCacheWorkflowKeyPrefix() {
const cacheKeyComponents = {
automationID: await getAutomationID()
// Add more components here as needed in the future
};
const componentsHash = createCacheKeyHash(cacheKeyComponents);
return `${CACHE_PREFIX}-${CACHE_VERSION}-${componentsHash}-${languages}-${codeQlVersion}-`;
return `${CACHE_PREFIX}-${CACHE_VERSION}-${componentsHash}-`;
}
function createCacheKeyHash(components) {
const componentsJson = JSON.stringify(components);
@@ -91734,7 +91739,7 @@ var fs12 = __toESM(require("fs"));
var path12 = __toESM(require("path"));
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// node_modules/uuid/dist-node/stringify.js
var byteToHex = [];
@@ -91797,7 +91802,7 @@ var stream = __toESM(require("stream"));
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
var MIN_REQUIRED_BSD_TAR_VERSION = "3.4.3";
var MIN_REQUIRED_GNU_TAR_VERSION = "1.31";
async function getTarVersion() {
@@ -91839,9 +91844,9 @@ async function isZstdAvailable(logger) {
case "gnu":
return {
available: foundZstdBinary && // GNU tar only uses major and minor version numbers
semver5.gte(
semver5.coerce(version),
semver5.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
semver6.gte(
semver6.coerce(version),
semver6.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
),
foundZstdBinary,
version: tarVersion
@@ -91850,7 +91855,7 @@ async function isZstdAvailable(logger) {
return {
available: foundZstdBinary && // Do a loose comparison since these version numbers don't contain
// a patch version number.
semver5.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
semver6.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
foundZstdBinary,
version: tarVersion
};
@@ -91957,7 +91962,7 @@ var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
var TOOLCACHE_TOOL_NAME = "CodeQL";
function makeDownloadFirstToolsDownloadDurations(downloadDurationMs, extractionDurationMs) {
@@ -92087,7 +92092,7 @@ function getToolcacheDirectory(version) {
return path11.join(
getRequiredEnvParam("RUNNER_TOOL_CACHE"),
TOOLCACHE_TOOL_NAME,
semver6.clean(version) || version,
semver7.clean(version) || version,
os2.arch() || ""
);
}
@@ -92211,13 +92216,13 @@ function tryGetTagNameFromUrl(url2, logger) {
return match[1];
}
function convertToSemVer(version, logger) {
if (!semver7.valid(version)) {
if (!semver8.valid(version)) {
logger.debug(
`Bundle version ${version} is not in SemVer format. Will treat it as pre-release 0.0.0-${version}.`
);
version = `0.0.0-${version}`;
}
const s = semver7.clean(version);
const s = semver8.clean(version);
if (!s) {
throw new Error(`Bundle version ${version} is not in SemVer format.`);
}
@@ -92291,7 +92296,7 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
url2 = toolsInput;
if (tagName) {
const bundleVersion3 = tryGetBundleVersionFromTagName(tagName, logger);
if (bundleVersion3 && semver7.valid(bundleVersion3)) {
if (bundleVersion3 && semver8.valid(bundleVersion3)) {
cliVersion2 = convertToSemVer(bundleVersion3, logger);
}
}
@@ -92561,7 +92566,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
async function useZstdBundle(cliVersion2, tarSupportsZstd) {
return (
// In testing, gzip performs better than zstd on Windows.
process.platform !== "win32" && tarSupportsZstd && semver7.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
process.platform !== "win32" && tarSupportsZstd && semver8.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
);
}
function getTempExtractionDir(tempDir) {
lib/autobuild-action.js
Generated
+56 -55
View File
@@ -24984,11 +24984,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse2();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -25195,8 +25195,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -26033,7 +26033,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -26044,12 +26044,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26347,7 +26347,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse2();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26385,7 +26385,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -29974,8 +29974,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31085,7 +31085,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs7 = __importStar4(require("fs"));
var path7 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants7();
var versionSalt = "1.0";
@@ -31182,7 +31182,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core14.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -73493,7 +73493,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os2 = require("os");
var cp = require("child_process");
@@ -73507,7 +73507,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -73516,7 +73516,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -73746,7 +73746,7 @@ var require_tool_cache = __commonJS({
var os2 = __importStar4(require("os"));
var path7 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -74020,7 +74020,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os2.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source dir: ${sourceDir}`);
@@ -74039,7 +74039,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os2.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source file: ${sourceFile}`);
@@ -74070,7 +74070,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path7.join(_getCacheDirectory(), toolName, versionSpec, arch);
core14.debug(`checking cache: ${cachePath}`);
if (fs7.existsSync(cachePath) && fs7.existsSync(`${cachePath}.complete`)) {
@@ -74154,7 +74154,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path7.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path7.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
core14.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io5.rmRF(folderPath);
@@ -74164,31 +74164,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch) {
const folderPath = path7.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path7.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
const markerPath = `${folderPath}.complete`;
fs7.writeFileSync(markerPath, "");
core14.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core14.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core14.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core14.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core14.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -78913,6 +78913,7 @@ async function isAnalyzingDefaultBranch() {
var fs3 = __toESM(require("fs"));
var path3 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -79054,20 +79055,20 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) {
// src/setup-codeql.ts
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// src/tar.ts
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
// src/tools-download.ts
var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
// src/tracer-config.ts
lib/init-action-post.js
Generated
+77 -76
View File
@@ -30833,11 +30833,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse4();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -31044,8 +31044,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -31128,7 +31128,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -31882,7 +31882,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -31893,12 +31893,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -32078,12 +32078,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -32092,11 +32092,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -32104,7 +32104,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -32116,9 +32116,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -32139,29 +32139,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -32196,7 +32196,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse4();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -32211,7 +32211,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -32234,7 +32234,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -35823,8 +35823,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -36934,7 +36934,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs20 = __importStar4(require("fs"));
var path19 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants10();
var versionSalt = "1.0";
@@ -37031,7 +37031,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core18.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -79342,7 +79342,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os3 = require("os");
var cp = require("child_process");
@@ -79356,7 +79356,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -79365,7 +79365,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -79595,7 +79595,7 @@ var require_tool_cache = __commonJS({
var os3 = __importStar4(require("os"));
var path19 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream2 = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -79869,7 +79869,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os3.arch();
core18.debug(`Caching tool ${tool} ${version} ${arch2}`);
core18.debug(`source dir: ${sourceDir}`);
@@ -79888,7 +79888,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os3.arch();
core18.debug(`Caching tool ${tool} ${version} ${arch2}`);
core18.debug(`source file: ${sourceFile}`);
@@ -79919,7 +79919,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path19.join(_getCacheDirectory(), toolName, versionSpec, arch2);
core18.debug(`checking cache: ${cachePath}`);
if (fs20.existsSync(cachePath) && fs20.existsSync(`${cachePath}.complete`)) {
@@ -80003,7 +80003,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path19.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path19.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
core18.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io7.rmRF(folderPath);
@@ -80013,31 +80013,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch2) {
const folderPath = path19.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path19.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
const markerPath = `${folderPath}.complete`;
fs20.writeFileSync(markerPath, "");
core18.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core18.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core18.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core18.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core18.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -87595,7 +87595,7 @@ var require_stream_writable = __commonJS({
pna.nextTick(cb, er);
}
function validChunk(stream2, state, chunk, cb) {
var valid3 = true;
var valid4 = true;
var er = false;
if (chunk === null) {
er = new TypeError("May not write null values to stream");
@@ -87605,9 +87605,9 @@ var require_stream_writable = __commonJS({
if (er) {
stream2.emit("error", er);
pna.nextTick(cb, er);
valid3 = false;
valid4 = false;
}
return valid3;
return valid4;
}
Writable.prototype.write = function(chunk, encoding, cb) {
var state = this._writableState;
@@ -120618,16 +120618,16 @@ var require_attribute = __commonJS({
var result = new ValidatorResult(instance, schema2, options, ctx);
var self2 = this;
schema2.allOf.forEach(function(v, i) {
var valid3 = self2.validateSchema(instance, v, options, ctx);
if (!valid3.valid) {
var valid4 = self2.validateSchema(instance, v, options, ctx);
if (!valid4.valid) {
var id = v.$id || v.id;
var msg = id || v.title && JSON.stringify(v.title) || v["$ref"] && "<" + v["$ref"] + ">" || "[subschema " + i + "]";
result.addError({
name: "allOf",
argument: { id: msg, length: valid3.errors.length, valid: valid3 },
message: "does not match allOf schema " + msg + " with " + valid3.errors.length + " error[s]:"
argument: { id: msg, length: valid4.errors.length, valid: valid4 },
message: "does not match allOf schema " + msg + " with " + valid4.errors.length + " error[s]:"
});
result.importErrors(valid3);
result.importErrors(valid4);
}
});
return result;
@@ -120916,8 +120916,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMinimum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance > schema2.exclusiveMinimum;
if (!valid3) {
var valid4 = instance > schema2.exclusiveMinimum;
if (!valid4) {
result.addError({
name: "exclusiveMinimum",
argument: schema2.exclusiveMinimum,
@@ -120930,8 +120930,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMaximum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance < schema2.exclusiveMaximum;
if (!valid3) {
var valid4 = instance < schema2.exclusiveMaximum;
if (!valid4) {
result.addError({
name: "exclusiveMaximum",
argument: schema2.exclusiveMaximum,
@@ -129515,6 +129515,7 @@ async function isAnalyzingDefaultBranch() {
var fs8 = __toESM(require("fs"));
var path9 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -129677,7 +129678,7 @@ var fs12 = __toESM(require("fs"));
var path12 = __toESM(require("path"));
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// node_modules/uuid/dist-node/stringify.js
var byteToHex = [];
@@ -129740,7 +129741,7 @@ var stream = __toESM(require("stream"));
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
var MIN_REQUIRED_BSD_TAR_VERSION = "3.4.3";
var MIN_REQUIRED_GNU_TAR_VERSION = "1.31";
async function getTarVersion() {
@@ -129782,9 +129783,9 @@ async function isZstdAvailable(logger) {
case "gnu":
return {
available: foundZstdBinary && // GNU tar only uses major and minor version numbers
semver5.gte(
semver5.coerce(version),
semver5.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
semver6.gte(
semver6.coerce(version),
semver6.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
),
foundZstdBinary,
version: tarVersion
@@ -129793,7 +129794,7 @@ async function isZstdAvailable(logger) {
return {
available: foundZstdBinary && // Do a loose comparison since these version numbers don't contain
// a patch version number.
semver5.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
semver6.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
foundZstdBinary,
version: tarVersion
};
@@ -129900,7 +129901,7 @@ var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
var TOOLCACHE_TOOL_NAME = "CodeQL";
function makeDownloadFirstToolsDownloadDurations(downloadDurationMs, extractionDurationMs) {
@@ -130030,7 +130031,7 @@ function getToolcacheDirectory(version) {
return path11.join(
getRequiredEnvParam("RUNNER_TOOL_CACHE"),
TOOLCACHE_TOOL_NAME,
semver6.clean(version) || version,
semver7.clean(version) || version,
os.arch() || ""
);
}
@@ -130154,13 +130155,13 @@ function tryGetTagNameFromUrl(url2, logger) {
return match[1];
}
function convertToSemVer(version, logger) {
if (!semver7.valid(version)) {
if (!semver8.valid(version)) {
logger.debug(
`Bundle version ${version} is not in SemVer format. Will treat it as pre-release 0.0.0-${version}.`
);
version = `0.0.0-${version}`;
}
const s = semver7.clean(version);
const s = semver8.clean(version);
if (!s) {
throw new Error(`Bundle version ${version} is not in SemVer format.`);
}
@@ -130234,7 +130235,7 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
url2 = toolsInput;
if (tagName) {
const bundleVersion3 = tryGetBundleVersionFromTagName(tagName, logger);
if (bundleVersion3 && semver7.valid(bundleVersion3)) {
if (bundleVersion3 && semver8.valid(bundleVersion3)) {
cliVersion2 = convertToSemVer(bundleVersion3, logger);
}
}
@@ -130504,7 +130505,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
async function useZstdBundle(cliVersion2, tarSupportsZstd) {
return (
// In testing, gzip performs better than zstd on Windows.
process.platform !== "win32" && tarSupportsZstd && semver7.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
process.platform !== "win32" && tarSupportsZstd && semver8.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
);
}
function getTempExtractionDir(tempDir) {
lib/init-action.js
Generated
+160 -72
View File
@@ -20275,11 +20275,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse2();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -20486,8 +20486,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt2 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt2;
var lt3 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt3;
}
});
@@ -20539,7 +20539,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt3 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -20570,7 +20570,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt3(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -21324,7 +21324,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt2 = require_lt();
var lt3 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -21335,12 +21335,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt3;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt3;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -21520,12 +21520,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt3;
for (const c2 of sub) {
if (c2.operator === ">" || c2.operator === ">=") {
gt = higherGT(gt, c2, options);
} else if (c2.operator === "<" || c2.operator === "<=") {
lt2 = lowerLT(lt2, c2, options);
lt3 = lowerLT(lt3, c2, options);
} else {
eqSet.add(c2.semver);
}
@@ -21534,11 +21534,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gt && lt3) {
gtltComp = compare(gt.semver, lt3.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt3.operator !== "<=")) {
return null;
}
}
@@ -21546,7 +21546,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt3 && !satisfies2(eq, String(lt3), options)) {
return null;
}
for (const c2 of dom) {
@@ -21558,9 +21558,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomLTPre = lt3 && !options.includePrerelease && lt3.semver.prerelease.length ? lt3.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt3.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c2 of dom) {
@@ -21581,29 +21581,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt3) {
if (needDomLTPre) {
if (c2.semver.prerelease && c2.semver.prerelease.length && c2.semver.major === needDomLTPre.major && c2.semver.minor === needDomLTPre.minor && c2.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c2.operator === "<" || c2.operator === "<=") {
lower = lowerLT(lt2, c2, options);
if (lower === c2 && lower !== lt2) {
lower = lowerLT(lt3, c2, options);
if (lower === c2 && lower !== lt3) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c2), options)) {
} else if (lt3.operator === "<=" && !satisfies2(lt3.semver, String(c2), options)) {
return false;
}
}
if (!c2.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c2.operator && (lt3 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt3 && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt3 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -21638,7 +21638,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse2();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -21653,7 +21653,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt3 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -21676,7 +21676,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -21691,7 +21691,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt: lt2,
lt: lt3,
eq,
neq,
gte: gte5,
@@ -35823,8 +35823,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
exports2.lt = lt3;
function lt3(a, b, loose) {
return compare(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt3(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt3;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt3;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -36934,7 +36934,7 @@ var require_cacheUtils = __commonJS({
var crypto2 = __importStar4(require("crypto"));
var fs18 = __importStar4(require("fs"));
var path20 = __importStar4(require("path"));
var semver9 = __importStar4(require_semver3());
var semver10 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants10();
var versionSalt = "1.0";
@@ -37031,7 +37031,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver9.clean(versionOutput);
const version = semver10.clean(versionOutput);
core14.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -80439,7 +80439,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver9 = __importStar4(require_semver2());
var semver10 = __importStar4(require_semver2());
var core_1 = require_core();
var os5 = require("os");
var cp = require("child_process");
@@ -80453,7 +80453,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver10.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -80462,7 +80462,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver9.satisfies(osVersion, item.platform_version);
chk = semver10.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -80692,7 +80692,7 @@ var require_tool_cache = __commonJS({
var os5 = __importStar4(require("os"));
var path20 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver9 = __importStar4(require_semver2());
var semver10 = __importStar4(require_semver2());
var stream2 = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -80966,7 +80966,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver9.clean(version) || version;
version = semver10.clean(version) || version;
arch2 = arch2 || os5.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch2}`);
core14.debug(`source dir: ${sourceDir}`);
@@ -80985,7 +80985,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver9.clean(version) || version;
version = semver10.clean(version) || version;
arch2 = arch2 || os5.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch2}`);
core14.debug(`source file: ${sourceFile}`);
@@ -81016,7 +81016,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver9.clean(versionSpec) || "";
versionSpec = semver10.clean(versionSpec) || "";
const cachePath = path20.join(_getCacheDirectory(), toolName, versionSpec, arch2);
core14.debug(`checking cache: ${cachePath}`);
if (fs18.existsSync(cachePath) && fs18.existsSync(`${cachePath}.complete`)) {
@@ -81100,7 +81100,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
const folderPath = path20.join(_getCacheDirectory(), tool, semver10.clean(version) || version, arch2 || "");
core14.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io7.rmRF(folderPath);
@@ -81110,31 +81110,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch2) {
const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
const folderPath = path20.join(_getCacheDirectory(), tool, semver10.clean(version) || version, arch2 || "");
const markerPath = `${folderPath}.complete`;
fs18.writeFileSync(markerPath, "");
core14.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c2 = semver9.clean(versionSpec) || "";
const c2 = semver10.clean(versionSpec) || "";
core14.debug(`isExplicit: ${c2}`);
const valid3 = semver9.valid(c2) != null;
core14.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver10.valid(c2) != null;
core14.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core14.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver9.gt(a, b)) {
if (semver10.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver9.satisfies(potential, versionSpec);
const satisfied = semver10.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -81724,7 +81724,7 @@ var fs17 = __toESM(require("fs"));
var path19 = __toESM(require("path"));
var core13 = __toESM(require_core());
var io6 = __toESM(require_io());
var semver8 = __toESM(require_semver2());
var semver9 = __toESM(require_semver2());
// node_modules/uuid/dist-node/stringify.js
var byteToHex = [];
@@ -86175,6 +86175,18 @@ function computeAutomationID(analysis_key, environment) {
}
return automationID;
}
async function getMostRecentActionsCacheEntry(key) {
const repositoryNwo = getRepositoryNwo();
const cacheItems = await getApiClient().rest.actions.getActionsCacheList({
owner: repositoryNwo.owner,
repo: repositoryNwo.repo,
key,
sort: "created_at",
direction: "desc",
per_page: 1
});
return cacheItems.data.actions_caches[0];
}
async function getRepositoryProperties(repositoryNwo) {
return getApiClient().request("GET /repos/:owner/:repo/properties/values", {
owner: repositoryNwo.owner,
@@ -87231,6 +87243,7 @@ var crypto = __toESM(require("crypto"));
var fs7 = __toESM(require("fs"));
var path9 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -87437,14 +87450,60 @@ async function downloadOverlayBaseDatabaseFromCache(codeql, config, logger) {
databaseDownloadDurationMs
};
}
var IGNORE_DATABASES_OLDER_THAN_N_DAYS = 14;
async function getCodeQLVersionFromOverlayBaseDatabase(logger) {
const keyPrefix = await getCacheWorkflowKeyPrefix();
const cacheItem = await getMostRecentActionsCacheEntry(keyPrefix);
if (cacheItem?.created_at === void 0 || cacheItem.key === void 0) {
logger.info("No overlay-base database cache entries found");
return void 0;
}
const cutoffTime = /* @__PURE__ */ new Date();
cutoffTime.setDate(cutoffTime.getDate() - IGNORE_DATABASES_OLDER_THAN_N_DAYS);
const cacheCreationTime = new Date(cacheItem.created_at);
if (cacheCreationTime < cutoffTime) {
logger.info(
`Not considering overlay-base database cache entry ${cacheItem.key} because it is too old (created at ${cacheItem.created_at})`
);
return void 0;
}
const keyParts = cacheItem.key.split("-");
if (keyParts.length < 9) {
logger.info(
`Overlay-base database cache entry ${cacheItem.key} has invalid key format`
);
return void 0;
}
const codeQlVersion = keyParts[keyParts.length - 2];
if (!semver5.valid(codeQlVersion)) {
logger.info(
`Overlay-base database cache entry ${cacheItem.key} has invalid CodeQL version ${codeQlVersion}`
);
return void 0;
}
if (semver5.lt(codeQlVersion, CODEQL_OVERLAY_MINIMUM_VERSION)) {
logger.info(
`Overlay-base database cache entry ${cacheItem.key} has CodeQL version ${codeQlVersion}, which is older than the minimum required version ${CODEQL_OVERLAY_MINIMUM_VERSION}`
);
return void 0;
}
logger.info(
`Found overlay-base database cache entry ${cacheItem.key} created at ${cacheItem.created_at} with CodeQL version ${codeQlVersion}`
);
return codeQlVersion;
}
async function getCacheRestoreKeyPrefix(config, codeQlVersion) {
const languages = [...config.languages].sort().join("_");
const workflowPrefix = await getCacheWorkflowKeyPrefix();
return `${workflowPrefix}${languages}-${codeQlVersion}-`;
}
async function getCacheWorkflowKeyPrefix() {
const cacheKeyComponents = {
automationID: await getAutomationID()
// Add more components here as needed in the future
};
const componentsHash = createCacheKeyHash(cacheKeyComponents);
return `${CACHE_PREFIX}-${CACHE_VERSION}-${componentsHash}-${languages}-${codeQlVersion}-`;
return `${CACHE_PREFIX}-${CACHE_VERSION}-${componentsHash}-`;
}
function createCacheKeyHash(components) {
const componentsJson = JSON.stringify(components);
@@ -88655,7 +88714,7 @@ var fs12 = __toESM(require("fs"));
var path14 = __toESM(require("path"));
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// src/tar.ts
var import_child_process = require("child_process");
@@ -88664,7 +88723,7 @@ var stream = __toESM(require("stream"));
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
var MIN_REQUIRED_BSD_TAR_VERSION = "3.4.3";
var MIN_REQUIRED_GNU_TAR_VERSION = "1.31";
async function getTarVersion() {
@@ -88706,9 +88765,9 @@ async function isZstdAvailable(logger) {
case "gnu":
return {
available: foundZstdBinary && // GNU tar only uses major and minor version numbers
semver5.gte(
semver5.coerce(version),
semver5.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
semver6.gte(
semver6.coerce(version),
semver6.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
),
foundZstdBinary,
version: tarVersion
@@ -88717,7 +88776,7 @@ async function isZstdAvailable(logger) {
return {
available: foundZstdBinary && // Do a loose comparison since these version numbers don't contain
// a patch version number.
semver5.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
semver6.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
foundZstdBinary,
version: tarVersion
};
@@ -88824,7 +88883,7 @@ var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
var TOOLCACHE_TOOL_NAME = "CodeQL";
function makeDownloadFirstToolsDownloadDurations(downloadDurationMs, extractionDurationMs) {
@@ -88954,7 +89013,7 @@ function getToolcacheDirectory(version) {
return path13.join(
getRequiredEnvParam("RUNNER_TOOL_CACHE"),
TOOLCACHE_TOOL_NAME,
semver6.clean(version) || version,
semver7.clean(version) || version,
os3.arch() || ""
);
}
@@ -89078,13 +89137,13 @@ function tryGetTagNameFromUrl(url, logger) {
return match[1];
}
function convertToSemVer(version, logger) {
if (!semver7.valid(version)) {
if (!semver8.valid(version)) {
logger.debug(
`Bundle version ${version} is not in SemVer format. Will treat it as pre-release 0.0.0-${version}.`
);
version = `0.0.0-${version}`;
}
const s = semver7.clean(version);
const s = semver8.clean(version);
if (!s) {
throw new Error(`Bundle version ${version} is not in SemVer format.`);
}
@@ -89158,7 +89217,7 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
url = toolsInput;
if (tagName) {
const bundleVersion3 = tryGetBundleVersionFromTagName(tagName, logger);
if (bundleVersion3 && semver7.valid(bundleVersion3)) {
if (bundleVersion3 && semver8.valid(bundleVersion3)) {
cliVersion2 = convertToSemVer(bundleVersion3, logger);
}
}
@@ -89428,7 +89487,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
async function useZstdBundle(cliVersion2, tarSupportsZstd) {
return (
// In testing, gzip performs better than zstd on Windows.
process.platform !== "win32" && tarSupportsZstd && semver7.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
process.platform !== "win32" && tarSupportsZstd && semver8.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
);
}
function getTempExtractionDir(tempDir) {
@@ -90767,13 +90826,42 @@ async function run() {
logger
};
amendInputConfigFile(inputs, logger);
await withGroupAsync(
"Compute preliminary overlay database mode",
async () => getPreliminaryOverlayDatabaseMode(inputs)
);
const codeQLDefaultVersionInfo = await features.getDefaultCliVersion(
gitHubVersion.type
);
await withGroupAsync(
"Compute CodeQL version to use for overlay analysis",
async () => {
if (getOptionalInput("tools")) {
logger.info(
"Nothing to do here because the workflow specified a tools input."
);
return;
}
const { overlayDatabaseMode, useOverlayDatabaseCaching } = await getPreliminaryOverlayDatabaseMode(inputs);
if (overlayDatabaseMode !== "overlay" /* Overlay */) {
logger.info(
"Nothing do to here because we are not performing overlay analysis"
);
return;
}
if (!useOverlayDatabaseCaching) {
logger.info(
`Nothing to do here because we are not using overlay database caching`
);
return;
}
const codeQlVersionForOverlay = await getCodeQLVersionFromOverlayBaseDatabase(logger);
if (codeQlVersionForOverlay === void 0) {
return;
}
logger.info(
`Using CodeQL version ${codeQlVersionForOverlay} for overlay analysis.`
);
codeQLDefaultVersionInfo.cliVersion = codeQlVersionForOverlay;
codeQLDefaultVersionInfo.tagName = `codeql-bundle-v${codeQlVersionForOverlay}`;
}
);
toolsFeatureFlagsValid = codeQLDefaultVersionInfo.toolsFeatureFlagsValid;
const initCodeQLResult = await initCodeQL(
getOptionalInput("tools"),
@@ -90806,12 +90894,12 @@ async function run() {
const experimental = "2.19.3";
const publicPreview = "2.22.1";
const actualVer = (await codeql.getVersion()).version;
if (semver8.lt(actualVer, experimental)) {
if (semver9.lt(actualVer, experimental)) {
throw new ConfigurationError(
`Rust analysis is supported by CodeQL CLI version ${experimental} or higher, but found version ${actualVer}`
);
}
if (semver8.lt(actualVer, publicPreview)) {
if (semver9.lt(actualVer, publicPreview)) {
core13.exportVariable("CODEQL_ENABLE_EXPERIMENTAL_FEATURES" /* EXPERIMENTAL_FEATURES */, "true");
logger.info("Experimental Rust analysis enabled");
}
lib/resolve-environment-action.js
Generated
+56 -55
View File
@@ -24984,11 +24984,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse2();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -25195,8 +25195,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -26033,7 +26033,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -26044,12 +26044,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26347,7 +26347,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse2();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26385,7 +26385,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -29974,8 +29974,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31085,7 +31085,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs5 = __importStar4(require("fs"));
var path5 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants7();
var versionSalt = "1.0";
@@ -31182,7 +31182,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core13.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -73493,7 +73493,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os2 = require("os");
var cp = require("child_process");
@@ -73507,7 +73507,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -73516,7 +73516,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -73746,7 +73746,7 @@ var require_tool_cache = __commonJS({
var os2 = __importStar4(require("os"));
var path5 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -74020,7 +74020,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os2.arch();
core13.debug(`Caching tool ${tool} ${version} ${arch}`);
core13.debug(`source dir: ${sourceDir}`);
@@ -74039,7 +74039,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os2.arch();
core13.debug(`Caching tool ${tool} ${version} ${arch}`);
core13.debug(`source file: ${sourceFile}`);
@@ -74070,7 +74070,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path5.join(_getCacheDirectory(), toolName, versionSpec, arch);
core13.debug(`checking cache: ${cachePath}`);
if (fs5.existsSync(cachePath) && fs5.existsSync(`${cachePath}.complete`)) {
@@ -74154,7 +74154,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path5.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path5.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
core13.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io5.rmRF(folderPath);
@@ -74164,31 +74164,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch) {
const folderPath = path5.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path5.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
const markerPath = `${folderPath}.complete`;
fs5.writeFileSync(markerPath, "");
core13.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core13.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core13.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core13.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core13.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -78640,6 +78640,7 @@ async function isAnalyzingDefaultBranch() {
var fs2 = __toESM(require("fs"));
var path2 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -78787,20 +78788,20 @@ var toolrunner3 = __toESM(require_toolrunner());
// src/setup-codeql.ts
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// src/tar.ts
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
// src/tools-download.ts
var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
// src/tracer-config.ts
lib/start-proxy-action-post.js
Generated
+59 -58
View File
@@ -24984,11 +24984,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse2();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -25195,8 +25195,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -26033,7 +26033,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -26044,12 +26044,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26347,7 +26347,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse2();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26385,7 +26385,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -29974,8 +29974,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31085,7 +31085,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs2 = __importStar4(require("fs"));
var path2 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants7();
var versionSalt = "1.0";
@@ -31182,7 +31182,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core14.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -80406,7 +80406,7 @@ var require_stream_writable = __commonJS({
pna.nextTick(cb, er);
}
function validChunk(stream, state, chunk, cb) {
var valid3 = true;
var valid4 = true;
var er = false;
if (chunk === null) {
er = new TypeError("May not write null values to stream");
@@ -80416,9 +80416,9 @@ var require_stream_writable = __commonJS({
if (er) {
stream.emit("error", er);
pna.nextTick(cb, er);
valid3 = false;
valid4 = false;
}
return valid3;
return valid4;
}
Writable.prototype.write = function(chunk, encoding, cb) {
var state = this._writableState;
@@ -111969,7 +111969,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os = require("os");
var cp = require("child_process");
@@ -111983,7 +111983,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -111992,7 +111992,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -112222,7 +112222,7 @@ var require_tool_cache = __commonJS({
var os = __importStar4(require("os"));
var path2 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -112496,7 +112496,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source dir: ${sourceDir}`);
@@ -112515,7 +112515,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source file: ${sourceFile}`);
@@ -112546,7 +112546,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path2.join(_getCacheDirectory(), toolName, versionSpec, arch);
core14.debug(`checking cache: ${cachePath}`);
if (fs2.existsSync(cachePath) && fs2.existsSync(`${cachePath}.complete`)) {
@@ -112630,7 +112630,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path2.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path2.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
core14.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io6.rmRF(folderPath);
@@ -112640,31 +112640,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch) {
const folderPath = path2.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path2.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
const markerPath = `${folderPath}.complete`;
fs2.writeFileSync(markerPath, "");
core14.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core14.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core14.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core14.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core14.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -117376,6 +117376,7 @@ var io3 = __toESM(require_io());
// src/overlay-database-utils.ts
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -117592,20 +117593,20 @@ var cliErrorsConfig = {
// src/setup-codeql.ts
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// src/tar.ts
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
// src/tools-download.ts
var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
// src/dependency-caching.ts
lib/upload-lib.js
Generated
+74 -73
View File
@@ -20239,16 +20239,16 @@ var require_attribute = __commonJS({
var result = new ValidatorResult(instance, schema2, options, ctx);
var self2 = this;
schema2.allOf.forEach(function(v, i) {
var valid3 = self2.validateSchema(instance, v, options, ctx);
if (!valid3.valid) {
var valid4 = self2.validateSchema(instance, v, options, ctx);
if (!valid4.valid) {
var id = v.$id || v.id;
var msg = id || v.title && JSON.stringify(v.title) || v["$ref"] && "<" + v["$ref"] + ">" || "[subschema " + i + "]";
result.addError({
name: "allOf",
argument: { id: msg, length: valid3.errors.length, valid: valid3 },
message: "does not match allOf schema " + msg + " with " + valid3.errors.length + " error[s]:"
argument: { id: msg, length: valid4.errors.length, valid: valid4 },
message: "does not match allOf schema " + msg + " with " + valid4.errors.length + " error[s]:"
});
result.importErrors(valid3);
result.importErrors(valid4);
}
});
return result;
@@ -20537,8 +20537,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMinimum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance > schema2.exclusiveMinimum;
if (!valid3) {
var valid4 = instance > schema2.exclusiveMinimum;
if (!valid4) {
result.addError({
name: "exclusiveMinimum",
argument: schema2.exclusiveMinimum,
@@ -20551,8 +20551,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMaximum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance < schema2.exclusiveMaximum;
if (!valid3) {
var valid4 = instance < schema2.exclusiveMaximum;
if (!valid4) {
result.addError({
name: "exclusiveMaximum",
argument: schema2.exclusiveMaximum,
@@ -32130,11 +32130,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse4();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -32341,8 +32341,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -32394,7 +32394,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -32425,7 +32425,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -33179,7 +33179,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -33190,12 +33190,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -33375,12 +33375,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -33389,11 +33389,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -33401,7 +33401,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -33413,9 +33413,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -33436,29 +33436,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -33493,7 +33493,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse4();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -33508,7 +33508,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -33531,7 +33531,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -33546,7 +33546,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -37120,8 +37120,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -37441,8 +37441,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -37487,7 +37487,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -38024,12 +38024,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -38231,7 +38231,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs14 = __importStar4(require("fs"));
var path15 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants10();
var versionSalt = "1.0";
@@ -38328,7 +38328,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core12.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -80639,7 +80639,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os2 = require("os");
var cp = require("child_process");
@@ -80653,7 +80653,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -80662,7 +80662,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -80892,7 +80892,7 @@ var require_tool_cache = __commonJS({
var os2 = __importStar4(require("os"));
var path15 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream2 = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -81166,7 +81166,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os2.arch();
core12.debug(`Caching tool ${tool} ${version} ${arch2}`);
core12.debug(`source dir: ${sourceDir}`);
@@ -81185,7 +81185,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os2.arch();
core12.debug(`Caching tool ${tool} ${version} ${arch2}`);
core12.debug(`source file: ${sourceFile}`);
@@ -81216,7 +81216,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path15.join(_getCacheDirectory(), toolName, versionSpec, arch2);
core12.debug(`checking cache: ${cachePath}`);
if (fs14.existsSync(cachePath) && fs14.existsSync(`${cachePath}.complete`)) {
@@ -81300,7 +81300,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path15.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path15.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
core12.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io6.rmRF(folderPath);
@@ -81310,31 +81310,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch2) {
const folderPath = path15.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path15.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
const markerPath = `${folderPath}.complete`;
fs14.writeFileSync(markerPath, "");
core12.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core12.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core12.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core12.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core12.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -89354,6 +89354,7 @@ async function isAnalyzingDefaultBranch() {
var fs6 = __toESM(require("fs"));
var path8 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -89505,7 +89506,7 @@ var fs10 = __toESM(require("fs"));
var path11 = __toESM(require("path"));
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// node_modules/uuid/dist-node/stringify.js
var byteToHex = [];
@@ -89568,7 +89569,7 @@ var stream = __toESM(require("stream"));
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
var MIN_REQUIRED_BSD_TAR_VERSION = "3.4.3";
var MIN_REQUIRED_GNU_TAR_VERSION = "1.31";
async function getTarVersion() {
@@ -89610,9 +89611,9 @@ async function isZstdAvailable(logger) {
case "gnu":
return {
available: foundZstdBinary && // GNU tar only uses major and minor version numbers
semver5.gte(
semver5.coerce(version),
semver5.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
semver6.gte(
semver6.coerce(version),
semver6.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
),
foundZstdBinary,
version: tarVersion
@@ -89621,7 +89622,7 @@ async function isZstdAvailable(logger) {
return {
available: foundZstdBinary && // Do a loose comparison since these version numbers don't contain
// a patch version number.
semver5.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
semver6.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
foundZstdBinary,
version: tarVersion
};
@@ -89728,7 +89729,7 @@ var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
var TOOLCACHE_TOOL_NAME = "CodeQL";
function makeDownloadFirstToolsDownloadDurations(downloadDurationMs, extractionDurationMs) {
@@ -89858,7 +89859,7 @@ function getToolcacheDirectory(version) {
return path10.join(
getRequiredEnvParam("RUNNER_TOOL_CACHE"),
TOOLCACHE_TOOL_NAME,
semver6.clean(version) || version,
semver7.clean(version) || version,
os.arch() || ""
);
}
@@ -89982,13 +89983,13 @@ function tryGetTagNameFromUrl(url2, logger) {
return match[1];
}
function convertToSemVer(version, logger) {
if (!semver7.valid(version)) {
if (!semver8.valid(version)) {
logger.debug(
`Bundle version ${version} is not in SemVer format. Will treat it as pre-release 0.0.0-${version}.`
);
version = `0.0.0-${version}`;
}
const s = semver7.clean(version);
const s = semver8.clean(version);
if (!s) {
throw new Error(`Bundle version ${version} is not in SemVer format.`);
}
@@ -90062,7 +90063,7 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
url2 = toolsInput;
if (tagName) {
const bundleVersion3 = tryGetBundleVersionFromTagName(tagName, logger);
if (bundleVersion3 && semver7.valid(bundleVersion3)) {
if (bundleVersion3 && semver8.valid(bundleVersion3)) {
cliVersion2 = convertToSemVer(bundleVersion3, logger);
}
}
@@ -90332,7 +90333,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
async function useZstdBundle(cliVersion2, tarSupportsZstd) {
return (
// In testing, gzip performs better than zstd on Windows.
process.platform !== "win32" && tarSupportsZstd && semver7.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
process.platform !== "win32" && tarSupportsZstd && semver8.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
);
}
function getTempExtractionDir(tempDir) {
lib/upload-sarif-action-post.js
Generated
+59 -58
View File
@@ -24984,11 +24984,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse2();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -25195,8 +25195,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -26033,7 +26033,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -26044,12 +26044,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26347,7 +26347,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse2();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26385,7 +26385,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -74490,7 +74490,7 @@ var require_stream_writable = __commonJS({
pna.nextTick(cb, er);
}
function validChunk(stream, state, chunk, cb) {
var valid3 = true;
var valid4 = true;
var er = false;
if (chunk === null) {
er = new TypeError("May not write null values to stream");
@@ -74500,9 +74500,9 @@ var require_stream_writable = __commonJS({
if (er) {
stream.emit("error", er);
pna.nextTick(cb, er);
valid3 = false;
valid4 = false;
}
return valid3;
return valid4;
}
Writable.prototype.write = function(chunk, encoding, cb) {
var state = this._writableState;
@@ -107798,8 +107798,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -108119,8 +108119,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -108165,7 +108165,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -108702,12 +108702,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -108909,7 +108909,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs2 = __importStar4(require("fs"));
var path2 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants10();
var versionSalt = "1.0";
@@ -109006,7 +109006,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core14.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -111969,7 +111969,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os = require("os");
var cp = require("child_process");
@@ -111983,7 +111983,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -111992,7 +111992,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -112222,7 +112222,7 @@ var require_tool_cache = __commonJS({
var os = __importStar4(require("os"));
var path2 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -112496,7 +112496,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source dir: ${sourceDir}`);
@@ -112515,7 +112515,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch = arch || os.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch}`);
core14.debug(`source file: ${sourceFile}`);
@@ -112546,7 +112546,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path2.join(_getCacheDirectory(), toolName, versionSpec, arch);
core14.debug(`checking cache: ${cachePath}`);
if (fs2.existsSync(cachePath) && fs2.existsSync(`${cachePath}.complete`)) {
@@ -112630,7 +112630,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path2.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path2.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
core14.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io6.rmRF(folderPath);
@@ -112640,31 +112640,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch) {
const folderPath = path2.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch || "");
const folderPath = path2.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch || "");
const markerPath = `${folderPath}.complete`;
fs2.writeFileSync(markerPath, "");
core14.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core14.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core14.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core14.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core14.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -117531,6 +117531,7 @@ var io3 = __toESM(require_io());
// src/overlay-database-utils.ts
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
// src/logging.ts
var core8 = __toESM(require_core());
@@ -117582,20 +117583,20 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
// src/setup-codeql.ts
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// src/tar.ts
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
// src/tools-download.ts
var core9 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
// src/dependency-caching.ts
lib/upload-sarif-action.js
Generated
+74 -73
View File
@@ -30833,11 +30833,11 @@ var require_valid = __commonJS({
"node_modules/semver/functions/valid.js"(exports2, module2) {
"use strict";
var parse = require_parse4();
var valid3 = (version, options) => {
var valid4 = (version, options) => {
const v = parse(version, options);
return v ? v.version : null;
};
module2.exports = valid3;
module2.exports = valid4;
}
});
@@ -31044,8 +31044,8 @@ var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var cmp = (a, op, b, loose) => {
switch (op) {
@@ -31128,7 +31128,7 @@ var require_cmp = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -31882,7 +31882,7 @@ var require_outside = __commonJS({
var Range2 = require_range();
var satisfies2 = require_satisfies();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var lte = require_lte();
var gte5 = require_gte();
var outside = (version, range, hilo, options) => {
@@ -31893,12 +31893,12 @@ var require_outside = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -32078,12 +32078,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt = lowerLT(lt, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -32092,11 +32092,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -32104,7 +32104,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt && !satisfies2(eq, String(lt), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -32116,9 +32116,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false;
let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false;
let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false;
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -32139,29 +32139,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt) {
if (lt2) {
if (needDomLTPre) {
if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) {
needDomLTPre = false;
}
}
if (c.operator === "<" || c.operator === "<=") {
lower = lowerLT(lt, c, options);
if (lower === c && lower !== lt) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -32196,7 +32196,7 @@ var require_semver2 = __commonJS({
var SemVer = require_semver();
var identifiers = require_identifiers();
var parse = require_parse4();
var valid3 = require_valid();
var valid4 = require_valid();
var clean3 = require_clean();
var inc = require_inc();
var diff = require_diff();
@@ -32211,7 +32211,7 @@ var require_semver2 = __commonJS({
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -32234,7 +32234,7 @@ var require_semver2 = __commonJS({
var subset = require_subset();
module2.exports = {
parse,
valid: valid3,
valid: valid4,
clean: clean3,
inc,
diff,
@@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({
sort,
rsort,
gt,
lt,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -35823,8 +35823,8 @@ var require_semver3 = __commonJS({
return null;
}
}
exports2.valid = valid3;
function valid3(version, options) {
exports2.valid = valid4;
function valid4(version, options) {
var v = parse(version, options);
return v ? v.version : null;
}
@@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
}
exports2.lt = lt;
function lt(a, b, loose) {
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt(a, b, loose);
return lt2(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -36934,7 +36934,7 @@ var require_cacheUtils = __commonJS({
var crypto = __importStar4(require("crypto"));
var fs16 = __importStar4(require("fs"));
var path16 = __importStar4(require("path"));
var semver8 = __importStar4(require_semver3());
var semver9 = __importStar4(require_semver3());
var util = __importStar4(require("util"));
var constants_1 = require_constants10();
var versionSalt = "1.0";
@@ -37031,7 +37031,7 @@ var require_cacheUtils = __commonJS({
function getCompressionMethod() {
return __awaiter4(this, void 0, void 0, function* () {
const versionOutput = yield getVersion("zstd", ["--quiet"]);
const version = semver8.clean(versionOutput);
const version = semver9.clean(versionOutput);
core14.debug(`zstd version: ${version}`);
if (versionOutput === "") {
return constants_1.CompressionMethod.Gzip;
@@ -79705,16 +79705,16 @@ var require_attribute = __commonJS({
var result = new ValidatorResult(instance, schema2, options, ctx);
var self2 = this;
schema2.allOf.forEach(function(v, i) {
var valid3 = self2.validateSchema(instance, v, options, ctx);
if (!valid3.valid) {
var valid4 = self2.validateSchema(instance, v, options, ctx);
if (!valid4.valid) {
var id = v.$id || v.id;
var msg = id || v.title && JSON.stringify(v.title) || v["$ref"] && "<" + v["$ref"] + ">" || "[subschema " + i + "]";
result.addError({
name: "allOf",
argument: { id: msg, length: valid3.errors.length, valid: valid3 },
message: "does not match allOf schema " + msg + " with " + valid3.errors.length + " error[s]:"
argument: { id: msg, length: valid4.errors.length, valid: valid4 },
message: "does not match allOf schema " + msg + " with " + valid4.errors.length + " error[s]:"
});
result.importErrors(valid3);
result.importErrors(valid4);
}
});
return result;
@@ -80003,8 +80003,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMinimum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance > schema2.exclusiveMinimum;
if (!valid3) {
var valid4 = instance > schema2.exclusiveMinimum;
if (!valid4) {
result.addError({
name: "exclusiveMinimum",
argument: schema2.exclusiveMinimum,
@@ -80017,8 +80017,8 @@ var require_attribute = __commonJS({
if (typeof schema2.exclusiveMaximum === "boolean") return;
if (!this.types.number(instance)) return;
var result = new ValidatorResult(instance, schema2, options, ctx);
var valid3 = instance < schema2.exclusiveMaximum;
if (!valid3) {
var valid4 = instance < schema2.exclusiveMaximum;
if (!valid4) {
result.addError({
name: "exclusiveMaximum",
argument: schema2.exclusiveMaximum,
@@ -80639,7 +80639,7 @@ var require_manifest = __commonJS({
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2._readLinuxVersionFile = exports2._getOsVersion = exports2._findMatch = void 0;
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var core_1 = require_core();
var os3 = require("os");
var cp = require("child_process");
@@ -80653,7 +80653,7 @@ var require_manifest = __commonJS({
for (const candidate of candidates) {
const version = candidate.version;
(0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
if (semver8.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
if (semver9.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
file = candidate.files.find((item) => {
(0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
let chk = item.arch === archFilter && item.platform === platFilter;
@@ -80662,7 +80662,7 @@ var require_manifest = __commonJS({
if (osVersion === item.platform_version) {
chk = true;
} else {
chk = semver8.satisfies(osVersion, item.platform_version);
chk = semver9.satisfies(osVersion, item.platform_version);
}
}
return chk;
@@ -80892,7 +80892,7 @@ var require_tool_cache = __commonJS({
var os3 = __importStar4(require("os"));
var path16 = __importStar4(require("path"));
var httpm = __importStar4(require_lib());
var semver8 = __importStar4(require_semver2());
var semver9 = __importStar4(require_semver2());
var stream2 = __importStar4(require("stream"));
var util = __importStar4(require("util"));
var assert_1 = require("assert");
@@ -81166,7 +81166,7 @@ var require_tool_cache = __commonJS({
}
function cacheDir(sourceDir, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os3.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch2}`);
core14.debug(`source dir: ${sourceDir}`);
@@ -81185,7 +81185,7 @@ var require_tool_cache = __commonJS({
exports2.cacheDir = cacheDir;
function cacheFile(sourceFile, targetFile, tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
version = semver8.clean(version) || version;
version = semver9.clean(version) || version;
arch2 = arch2 || os3.arch();
core14.debug(`Caching tool ${tool} ${version} ${arch2}`);
core14.debug(`source file: ${sourceFile}`);
@@ -81216,7 +81216,7 @@ var require_tool_cache = __commonJS({
}
let toolPath = "";
if (versionSpec) {
versionSpec = semver8.clean(versionSpec) || "";
versionSpec = semver9.clean(versionSpec) || "";
const cachePath = path16.join(_getCacheDirectory(), toolName, versionSpec, arch2);
core14.debug(`checking cache: ${cachePath}`);
if (fs16.existsSync(cachePath) && fs16.existsSync(`${cachePath}.complete`)) {
@@ -81300,7 +81300,7 @@ var require_tool_cache = __commonJS({
}
function _createToolPath(tool, version, arch2) {
return __awaiter4(this, void 0, void 0, function* () {
const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path16.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
core14.debug(`destination ${folderPath}`);
const markerPath = `${folderPath}.complete`;
yield io6.rmRF(folderPath);
@@ -81310,31 +81310,31 @@ var require_tool_cache = __commonJS({
});
}
function _completeToolPath(tool, version, arch2) {
const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || "");
const folderPath = path16.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || "");
const markerPath = `${folderPath}.complete`;
fs16.writeFileSync(markerPath, "");
core14.debug("finished caching tool");
}
function isExplicitVersion(versionSpec) {
const c = semver8.clean(versionSpec) || "";
const c = semver9.clean(versionSpec) || "";
core14.debug(`isExplicit: ${c}`);
const valid3 = semver8.valid(c) != null;
core14.debug(`explicit? ${valid3}`);
return valid3;
const valid4 = semver9.valid(c) != null;
core14.debug(`explicit? ${valid4}`);
return valid4;
}
exports2.isExplicitVersion = isExplicitVersion;
function evaluateVersions(versions, versionSpec) {
let version = "";
core14.debug(`evaluating ${versions.length} versions`);
versions = versions.sort((a, b) => {
if (semver8.gt(a, b)) {
if (semver9.gt(a, b)) {
return 1;
}
return -1;
});
for (let i = versions.length - 1; i >= 0; i--) {
const potential = versions[i];
const satisfied = semver8.satisfies(potential, versionSpec);
const satisfied = semver9.satisfies(potential, versionSpec);
if (satisfied) {
version = potential;
break;
@@ -89642,6 +89642,7 @@ async function isAnalyzingDefaultBranch() {
var fs7 = __toESM(require("fs"));
var path9 = __toESM(require("path"));
var actionsCache = __toESM(require_cache3());
var semver5 = __toESM(require_semver2());
var OVERLAY_BASE_DATABASE_MAX_UPLOAD_SIZE_MB = 15e3;
var OVERLAY_BASE_DATABASE_MAX_UPLOAD_SIZE_BYTES = OVERLAY_BASE_DATABASE_MAX_UPLOAD_SIZE_MB * 1e6;
async function writeBaseDatabaseOidsFile(config, sourceRoot) {
@@ -90204,7 +90205,7 @@ var fs11 = __toESM(require("fs"));
var path12 = __toESM(require("path"));
var toolcache3 = __toESM(require_tool_cache());
var import_fast_deep_equal = __toESM(require_fast_deep_equal());
var semver7 = __toESM(require_semver2());
var semver8 = __toESM(require_semver2());
// node_modules/uuid/dist-node/stringify.js
var byteToHex = [];
@@ -90267,7 +90268,7 @@ var stream = __toESM(require("stream"));
var import_toolrunner = __toESM(require_toolrunner());
var io4 = __toESM(require_io());
var toolcache = __toESM(require_tool_cache());
var semver5 = __toESM(require_semver2());
var semver6 = __toESM(require_semver2());
var MIN_REQUIRED_BSD_TAR_VERSION = "3.4.3";
var MIN_REQUIRED_GNU_TAR_VERSION = "1.31";
async function getTarVersion() {
@@ -90309,9 +90310,9 @@ async function isZstdAvailable(logger) {
case "gnu":
return {
available: foundZstdBinary && // GNU tar only uses major and minor version numbers
semver5.gte(
semver5.coerce(version),
semver5.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
semver6.gte(
semver6.coerce(version),
semver6.coerce(MIN_REQUIRED_GNU_TAR_VERSION)
),
foundZstdBinary,
version: tarVersion
@@ -90320,7 +90321,7 @@ async function isZstdAvailable(logger) {
return {
available: foundZstdBinary && // Do a loose comparison since these version numbers don't contain
// a patch version number.
semver5.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
semver6.gte(version, MIN_REQUIRED_BSD_TAR_VERSION),
foundZstdBinary,
version: tarVersion
};
@@ -90427,7 +90428,7 @@ var core10 = __toESM(require_core());
var import_http_client = __toESM(require_lib());
var toolcache2 = __toESM(require_tool_cache());
var import_follow_redirects = __toESM(require_follow_redirects());
var semver6 = __toESM(require_semver2());
var semver7 = __toESM(require_semver2());
var STREAMING_HIGH_WATERMARK_BYTES = 4 * 1024 * 1024;
var TOOLCACHE_TOOL_NAME = "CodeQL";
function makeDownloadFirstToolsDownloadDurations(downloadDurationMs, extractionDurationMs) {
@@ -90557,7 +90558,7 @@ function getToolcacheDirectory(version) {
return path11.join(
getRequiredEnvParam("RUNNER_TOOL_CACHE"),
TOOLCACHE_TOOL_NAME,
semver6.clean(version) || version,
semver7.clean(version) || version,
os2.arch() || ""
);
}
@@ -90681,13 +90682,13 @@ function tryGetTagNameFromUrl(url2, logger) {
return match[1];
}
function convertToSemVer(version, logger) {
if (!semver7.valid(version)) {
if (!semver8.valid(version)) {
logger.debug(
`Bundle version ${version} is not in SemVer format. Will treat it as pre-release 0.0.0-${version}.`
);
version = `0.0.0-${version}`;
}
const s = semver7.clean(version);
const s = semver8.clean(version);
if (!s) {
throw new Error(`Bundle version ${version} is not in SemVer format.`);
}
@@ -90761,7 +90762,7 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
url2 = toolsInput;
if (tagName) {
const bundleVersion3 = tryGetBundleVersionFromTagName(tagName, logger);
if (bundleVersion3 && semver7.valid(bundleVersion3)) {
if (bundleVersion3 && semver8.valid(bundleVersion3)) {
cliVersion2 = convertToSemVer(bundleVersion3, logger);
}
}
@@ -91031,7 +91032,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
async function useZstdBundle(cliVersion2, tarSupportsZstd) {
return (
// In testing, gzip performs better than zstd on Windows.
process.platform !== "win32" && tarSupportsZstd && semver7.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
process.platform !== "win32" && tarSupportsZstd && semver8.gte(cliVersion2, CODEQL_VERSION_ZSTD_BUNDLE)
);
}
function getTempExtractionDir(tempDir) {