From 297313df79f4bcbd08eb529220f6b82f3c2fdeb8 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Fri, 3 Oct 2025 14:15:55 +0100 Subject: [PATCH 1/8] Add `getLatestToolcacheVersion` with tests --- lib/analyze-action-post.js | 58 +++++++++++++++---------------- lib/analyze-action.js | 58 +++++++++++++++---------------- lib/autobuild-action.js | 58 +++++++++++++++---------------- lib/init-action-post.js | 58 +++++++++++++++---------------- lib/init-action.js | 58 +++++++++++++++---------------- lib/resolve-environment-action.js | 58 +++++++++++++++---------------- lib/start-proxy-action-post.js | 58 +++++++++++++++---------------- lib/upload-lib.js | 58 +++++++++++++++---------------- lib/upload-sarif-action-post.js | 58 +++++++++++++++---------------- lib/upload-sarif-action.js | 58 +++++++++++++++---------------- src/setup-codeql.test.ts | 13 +++++++ src/setup-codeql.ts | 28 +++++++++++++++ 12 files changed, 331 insertions(+), 290 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index a9b163bc16..bcc8753eb4 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -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) { @@ -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(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/analyze-action.js b/lib/analyze-action.js index c2788900b3..6951aaef09 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -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) { @@ -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(); @@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 4cde47d65b..3f5c705517 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -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) { @@ -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(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index e138420a3e..def7116e42 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -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) { @@ -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(); @@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/init-action.js b/lib/init-action.js index 2f509ad0ee..42e063aad1 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -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 c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt3 = lowerLT(lt3, c, options); } else { eqSet.add(c.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 c 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 c of dom) { @@ -21581,29 +21581,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt3) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt3, c, options); + if (lower === c && lower !== lt3) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt3.operator === "<=" && !satisfies2(lt3.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.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) { @@ -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(); @@ -21691,7 +21691,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt: lt2, + lt: lt3, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 67cb394e74..2a9c4102b7 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -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) { @@ -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(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index a52eadfc51..d9a7163aef 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -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) { @@ -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(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index a6342ff212..63d887a2b3 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -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) { @@ -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(); @@ -33546,7 +33546,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 233b73d473..a0dc0ed196 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -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) { @@ -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(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 7ad72583b5..30ed1a1bd9 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -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) { @@ -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(); @@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -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 = "<"; diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts index 6e4a1dc072..f2f199b7d3 100644 --- a/src/setup-codeql.test.ts +++ b/src/setup-codeql.test.ts @@ -1,5 +1,6 @@ import * as path from "path"; +import * as toolcache from "@actions/tool-cache"; import test from "ava"; import * as sinon from "sinon"; @@ -263,3 +264,15 @@ test('tryGetTagNameFromUrl extracts the right tag name for a repo name containin "codeql-bundle-v2.19.0", ); }); + +test("getLatestToolcacheVersion returns undefined if there are no CodeQL CLIs in the toolcache", (t) => { + sinon.stub(toolcache, "findAllVersions").returns([]); + t.is(setupCodeql.getLatestToolcacheVersion(getRunnerLogger(true)), undefined); +}); + +test("getLatestToolcacheVersion returns latest version in the toolcache", (t) => { + const testVersions = ["2.3.1", "3.2.1", "1.2.3"]; + sinon.stub(toolcache, "findAllVersions").returns(testVersions); + + t.is(setupCodeql.getLatestToolcacheVersion(getRunnerLogger(true)), "3.2.1"); +}); diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts index 127bb1b930..4f5db88f3f 100644 --- a/src/setup-codeql.ts +++ b/src/setup-codeql.ts @@ -816,6 +816,34 @@ async function getNightlyToolsUrl(logger: Logger) { } } +/** + * Gets the latest version of the CodeQL CLI that is available in the toolcache, or `undefined` + * if no CodeQL CLI is available in the toolcache. + * + * @param logger The logger to use. + * @returns The latest version of the CodeQL CLI that is available in the toolcache, or `undefined` if there is none. + */ +export function getLatestToolcacheVersion(logger: Logger): string | undefined { + const allVersions = toolcache + .findAllVersions("CodeQL") + .sort((a, b) => (semver.lt(a, b) ? 1 : -1)); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions, + )}.`, + ); + + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.`, + ); + return latestToolcacheVersion; + } + + return undefined; +} + function isReservedToolsValue(tools: string): boolean { return ( CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || From 425ef8559525de0beae442f8231cc3d3425cef08 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Fri, 3 Oct 2025 15:40:33 +0100 Subject: [PATCH 2/8] Support requesting CLI from toolcache with `tools: toolcache` --- init/action.yml | 2 + lib/analyze-action.js | 33 +++++++++++- lib/init-action-post.js | 33 +++++++++++- lib/init-action.js | 33 +++++++++++- lib/upload-lib.js | 33 +++++++++++- lib/upload-sarif-action.js | 33 +++++++++++- src/setup-codeql.test.ts | 107 +++++++++++++++++++++++++++++++++++++ src/setup-codeql.ts | 25 ++++++++- 8 files changed, 293 insertions(+), 6 deletions(-) diff --git a/init/action.yml b/init/action.yml index ba5d6efcc1..5b2baaeca9 100644 --- a/init/action.yml +++ b/init/action.yml @@ -15,6 +15,8 @@ inputs: - A special value `nightly` which uses the latest nightly version of the CodeQL tools. Note that this is unstable and not recommended for production use. + - A special value `toolcache` which uses the latest version available in the + toolcache on the runner. If not specified, the Action will check in several places until it finds the CodeQL tools. diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 6951aaef09..d0486873fa 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -92111,6 +92111,7 @@ var CODEQL_NIGHTLIES_REPOSITORY_OWNER = "dsp-testing"; var CODEQL_NIGHTLIES_REPOSITORY_NAME = "codeql-cli-nightlies"; var CODEQL_BUNDLE_VERSION_ALIAS = ["linked", "latest"]; var CODEQL_NIGHTLY_TOOLS_INPUTS = ["nightly", "nightly-latest"]; +var CODEQL_TOOLCACHE_INPUT = "toolcache"; function getCodeQLBundleExtension(compressionMethod) { switch (compressionMethod) { case "gzip": @@ -92289,6 +92290,20 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required." ); } + } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { + logger.info( + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` + ); + const latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } else { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + cliVersion2 = defaultCliVersion.cliVersion; + tagName = defaultCliVersion.tagName; + } } else if (toolsInput !== void 0) { tagName = tryGetTagNameFromUrl(toolsInput, logger); url2 = toolsInput; @@ -92595,8 +92610,24 @@ async function getNightlyToolsUrl(logger) { ); } } +function getLatestToolcacheVersion(logger) { + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions + )}.` + ); + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.` + ); + return latestToolcacheVersion; + } + return void 0; +} function isReservedToolsValue(tools) { - return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) || tools === CODEQL_TOOLCACHE_INPUT; } // src/tracer-config.ts diff --git a/lib/init-action-post.js b/lib/init-action-post.js index def7116e42..c905b89bc5 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -130093,6 +130093,7 @@ var CODEQL_NIGHTLIES_REPOSITORY_OWNER = "dsp-testing"; var CODEQL_NIGHTLIES_REPOSITORY_NAME = "codeql-cli-nightlies"; var CODEQL_BUNDLE_VERSION_ALIAS = ["linked", "latest"]; var CODEQL_NIGHTLY_TOOLS_INPUTS = ["nightly", "nightly-latest"]; +var CODEQL_TOOLCACHE_INPUT = "toolcache"; function getCodeQLBundleExtension(compressionMethod) { switch (compressionMethod) { case "gzip": @@ -130271,6 +130272,20 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required." ); } + } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { + logger.info( + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` + ); + const latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } else { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + cliVersion2 = defaultCliVersion.cliVersion; + tagName = defaultCliVersion.tagName; + } } else if (toolsInput !== void 0) { tagName = tryGetTagNameFromUrl(toolsInput, logger); url2 = toolsInput; @@ -130577,8 +130592,24 @@ async function getNightlyToolsUrl(logger) { ); } } +function getLatestToolcacheVersion(logger) { + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions + )}.` + ); + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.` + ); + return latestToolcacheVersion; + } + return void 0; +} function isReservedToolsValue(tools) { - return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) || tools === CODEQL_TOOLCACHE_INPUT; } // src/tracer-config.ts diff --git a/lib/init-action.js b/lib/init-action.js index 42e063aad1..32512e9df2 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -88886,6 +88886,7 @@ var CODEQL_NIGHTLIES_REPOSITORY_OWNER = "dsp-testing"; var CODEQL_NIGHTLIES_REPOSITORY_NAME = "codeql-cli-nightlies"; var CODEQL_BUNDLE_VERSION_ALIAS = ["linked", "latest"]; var CODEQL_NIGHTLY_TOOLS_INPUTS = ["nightly", "nightly-latest"]; +var CODEQL_TOOLCACHE_INPUT = "toolcache"; function getCodeQLBundleExtension(compressionMethod) { switch (compressionMethod) { case "gzip": @@ -89064,6 +89065,20 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required." ); } + } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { + logger.info( + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` + ); + const latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } else { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + cliVersion2 = defaultCliVersion.cliVersion; + tagName = defaultCliVersion.tagName; + } } else if (toolsInput !== void 0) { tagName = tryGetTagNameFromUrl(toolsInput, logger); url = toolsInput; @@ -89370,8 +89385,24 @@ async function getNightlyToolsUrl(logger) { ); } } +function getLatestToolcacheVersion(logger) { + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions + )}.` + ); + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.` + ); + return latestToolcacheVersion; + } + return void 0; +} function isReservedToolsValue(tools) { - return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) || tools === CODEQL_TOOLCACHE_INPUT; } // src/tracer-config.ts diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 63d887a2b3..e0cbdcbb59 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -89927,6 +89927,7 @@ var CODEQL_NIGHTLIES_REPOSITORY_OWNER = "dsp-testing"; var CODEQL_NIGHTLIES_REPOSITORY_NAME = "codeql-cli-nightlies"; var CODEQL_BUNDLE_VERSION_ALIAS = ["linked", "latest"]; var CODEQL_NIGHTLY_TOOLS_INPUTS = ["nightly", "nightly-latest"]; +var CODEQL_TOOLCACHE_INPUT = "toolcache"; function getCodeQLBundleExtension(compressionMethod) { switch (compressionMethod) { case "gzip": @@ -90105,6 +90106,20 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required." ); } + } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { + logger.info( + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` + ); + const latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } else { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + cliVersion2 = defaultCliVersion.cliVersion; + tagName = defaultCliVersion.tagName; + } } else if (toolsInput !== void 0) { tagName = tryGetTagNameFromUrl(toolsInput, logger); url2 = toolsInput; @@ -90411,8 +90426,24 @@ async function getNightlyToolsUrl(logger) { ); } } +function getLatestToolcacheVersion(logger) { + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions + )}.` + ); + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.` + ); + return latestToolcacheVersion; + } + return void 0; +} function isReservedToolsValue(tools) { - return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) || tools === CODEQL_TOOLCACHE_INPUT; } // src/tracer-config.ts diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 30ed1a1bd9..d8ec6eabe2 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -90599,6 +90599,7 @@ var CODEQL_NIGHTLIES_REPOSITORY_OWNER = "dsp-testing"; var CODEQL_NIGHTLIES_REPOSITORY_NAME = "codeql-cli-nightlies"; var CODEQL_BUNDLE_VERSION_ALIAS = ["linked", "latest"]; var CODEQL_NIGHTLY_TOOLS_INPUTS = ["nightly", "nightly-latest"]; +var CODEQL_TOOLCACHE_INPUT = "toolcache"; function getCodeQLBundleExtension(compressionMethod) { switch (compressionMethod) { case "gzip": @@ -90777,6 +90778,20 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required." ); } + } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { + logger.info( + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` + ); + const latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } else { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + cliVersion2 = defaultCliVersion.cliVersion; + tagName = defaultCliVersion.tagName; + } } else if (toolsInput !== void 0) { tagName = tryGetTagNameFromUrl(toolsInput, logger); url2 = toolsInput; @@ -91083,8 +91098,24 @@ async function getNightlyToolsUrl(logger) { ); } } +function getLatestToolcacheVersion(logger) { + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions + )}.` + ); + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.` + ); + return latestToolcacheVersion; + } + return void 0; +} function isReservedToolsValue(tools) { - return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) || tools === CODEQL_TOOLCACHE_INPUT; } // src/tracer-config.ts diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts index f2f199b7d3..f2bb7efb4c 100644 --- a/src/setup-codeql.test.ts +++ b/src/setup-codeql.test.ts @@ -255,6 +255,113 @@ test("setupCodeQLBundle logs the CodeQL CLI version being used when asked to dow }); }); +test("getCodeQLSource correctly returns latest version from toolcache when tools == toolcache", async (t) => { + const loggedMessages: LoggedMessage[] = []; + const logger = getRecordingLogger(loggedMessages); + + const latestToolcacheVersion = "3.2.1"; + const latestVersionPath = "/path/to/latest"; + const testVersions = ["2.3.1", latestToolcacheVersion, "1.2.3"]; + const findAllVersionsStub = sinon + .stub(toolcache, "findAllVersions") + .returns(testVersions); + const findStub = sinon.stub(toolcache, "find"); + findStub + .withArgs("CodeQL", latestToolcacheVersion) + .returns(latestVersionPath); + + await withTmpDir(async (tmpDir) => { + setupActionsVars(tmpDir, tmpDir); + const source = await setupCodeql.getCodeQLSource( + "toolcache", + SAMPLE_DEFAULT_CLI_VERSION, + SAMPLE_DOTCOM_API_DETAILS, + GitHubVariant.DOTCOM, + false, + logger, + ); + + // Check that the toolcache functions were called with the expected arguments + t.assert( + findAllVersionsStub.calledOnceWith("CodeQL"), + `toolcache.findAllVersions("CodeQL") wasn't called`, + ); + t.assert( + findStub.calledOnceWith("CodeQL", latestToolcacheVersion), + `toolcache.find("CodeQL", ${latestToolcacheVersion}) wasn't called`, + ); + + // Check that `sourceType` and `toolsVersion` match expectations. + t.is(source.sourceType, "toolcache"); + t.is(source.toolsVersion, latestToolcacheVersion); + + // Check that key messages we would expect to find in the log are present. + const expectedMessages: string[] = [ + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: toolcache'.`, + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.`, + `Using CodeQL CLI version ${latestToolcacheVersion} from toolcache at ${latestVersionPath}`, + ]; + for (const expectedMessage of expectedMessages) { + t.assert( + loggedMessages.some( + (msg) => + typeof msg.message === "string" && + msg.message.includes(expectedMessage), + ), + `Expected '${expectedMessage}' in the logger output, but didn't find it.`, + ); + } + }); +}); + +test("getCodeQLSource falls back to downloading the CLI if the toolcache doesn't have a CodeQL CLI when tools == toolcache", async (t) => { + const loggedMessages: LoggedMessage[] = []; + const logger = getRecordingLogger(loggedMessages); + + const testVersions = []; + const findAllVersionsStub = sinon + .stub(toolcache, "findAllVersions") + .returns(testVersions); + + await withTmpDir(async (tmpDir) => { + setupActionsVars(tmpDir, tmpDir); + const source = await setupCodeql.getCodeQLSource( + "toolcache", + SAMPLE_DEFAULT_CLI_VERSION, + SAMPLE_DOTCOM_API_DETAILS, + GitHubVariant.DOTCOM, + false, + logger, + ); + + // Check that the toolcache functions were called with the expected arguments + t.assert( + findAllVersionsStub.calledWith("CodeQL"), + `toolcache.findAllVersions("CodeQL") wasn't called`, + ); + + // Check that `sourceType` and `toolsVersion` match expectations. + t.is(source.sourceType, "download"); + t.is(source.toolsVersion, SAMPLE_DEFAULT_CLI_VERSION.cliVersion); + + // Check that key messages we would expect to find in the log are present. + const expectedMessages: string[] = [ + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: toolcache'.`, + `Found no CodeQL CLI in the toolcache, ignoring 'tools: toolcache'...`, + ]; + for (const expectedMessage of expectedMessages) { + t.assert( + loggedMessages.some( + (msg) => + typeof msg.message === "string" && + msg.message.includes(expectedMessage), + ), + `Expected '${expectedMessage}' in the logger output, but didn't find it.`, + ); + } + }); +}); + test('tryGetTagNameFromUrl extracts the right tag name for a repo name containing "codeql-bundle"', (t) => { t.is( setupCodeql.tryGetTagNameFromUrl( diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts index 4f5db88f3f..5ae0c5fa35 100644 --- a/src/setup-codeql.ts +++ b/src/setup-codeql.ts @@ -38,6 +38,7 @@ const CODEQL_NIGHTLIES_REPOSITORY_NAME = "codeql-cli-nightlies"; const CODEQL_BUNDLE_VERSION_ALIAS: string[] = ["linked", "latest"]; const CODEQL_NIGHTLY_TOOLS_INPUTS = ["nightly", "nightly-latest"]; +const CODEQL_TOOLCACHE_INPUT = "toolcache"; function getCodeQLBundleExtension( compressionMethod: tar.CompressionMethod, @@ -346,6 +347,27 @@ export async function getCodeQLSource( "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required.", ); } + } else if ( + toolsInput !== undefined && + toolsInput === CODEQL_TOOLCACHE_INPUT + ) { + // If `toolsInput === "toolcache"`, try to find the latest version of the CLI that's available in the toolcache + // and use that. We perform this check here since we can set `cliVersion` directly and don't want to default to + // the linked version. + logger.info( + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.`, + ); + + const latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion = latestToolcacheVersion; + } else { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...`, + ); + cliVersion = defaultCliVersion.cliVersion; + tagName = defaultCliVersion.tagName; + } } else if (toolsInput !== undefined) { // If a tools URL was provided, then use that. tagName = tryGetTagNameFromUrl(toolsInput, logger); @@ -847,6 +869,7 @@ export function getLatestToolcacheVersion(logger: Logger): string | undefined { function isReservedToolsValue(tools: string): boolean { return ( CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || - CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) + CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools) || + tools === CODEQL_TOOLCACHE_INPUT ); } From 7d468c931cabb064c8d5c0eeed3f5c30af4e6e89 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Fri, 3 Oct 2025 15:48:04 +0100 Subject: [PATCH 3/8] Accept `toolcache` as `version` value for `prepare-test` --- .github/actions/prepare-test/action.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/prepare-test/action.yml b/.github/actions/prepare-test/action.yml index ecabaa69f3..5e2b5028f7 100644 --- a/.github/actions/prepare-test/action.yml +++ b/.github/actions/prepare-test/action.yml @@ -2,7 +2,7 @@ name: "Prepare test" description: Performs some preparation to run tests inputs: version: - description: "The version of the CodeQL CLI to use. Can be 'linked', 'default', 'nightly', 'nightly-latest', 'nightly-YYYYMMDD', or 'stable-vX.Y.Z" + description: "The version of the CodeQL CLI to use. Can be 'linked', 'default', 'toolcache', 'nightly', 'nightly-latest', 'nightly-YYYYMMDD', or 'stable-vX.Y.Z" required: true use-all-platform-bundle: description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL" @@ -41,6 +41,9 @@ runs: elif [[ "$VERSION" == "linked" ]]; then echo "tools-url=linked" >> "$GITHUB_OUTPUT" exit 0 + elif [[ "$VERSION" == "toolcache" ]]; then + echo "tools-url=toolcache" >> "$GITHUB_OUTPUT" + exit 0 elif [[ "$VERSION" == "default" ]]; then echo "tools-url=" >> "$GITHUB_OUTPUT" exit 0 From 13a3a6890f9c7464d5a7e0afe6df24f317d8a4b0 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Fri, 3 Oct 2025 15:49:29 +0100 Subject: [PATCH 4/8] Add basic PR check for `tools: toolcache` --- .github/workflows/__bundle-from-toolcache.yml | 86 +++++++++++++++++++ pr-checks/checks/bundle-from-toolcache.yml | 32 +++++++ 2 files changed, 118 insertions(+) create mode 100644 .github/workflows/__bundle-from-toolcache.yml create mode 100644 pr-checks/checks/bundle-from-toolcache.yml diff --git a/.github/workflows/__bundle-from-toolcache.yml b/.github/workflows/__bundle-from-toolcache.yml new file mode 100644 index 0000000000..c8957ac58e --- /dev/null +++ b/.github/workflows/__bundle-from-toolcache.yml @@ -0,0 +1,86 @@ +# Warning: This file is generated automatically, and should not be modified. +# Instead, please modify the template in the pr-checks directory and run: +# pr-checks/sync.sh +# to regenerate this file. + +name: 'PR Check - Bundle: From toolcache' +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GO111MODULE: auto +on: + push: + branches: + - main + - releases/v* + pull_request: + types: + - opened + - synchronize + - reopened + - ready_for_review + schedule: + - cron: '0 5 * * *' + workflow_dispatch: + inputs: {} + workflow_call: + inputs: {} +defaults: + run: + shell: bash +concurrency: + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + group: ${{ github.workflow }}-${{ github.ref }} +jobs: + bundle-from-toolcache: + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-latest + version: toolcache + name: 'Bundle: From toolcache' + if: github.triggering_actor != 'dependabot[bot]' + permissions: + contents: read + security-events: read + timeout-minutes: 45 + runs-on: ${{ matrix.os }} + steps: + - name: Check out repository + uses: actions/checkout@v5 + - name: Prepare test + id: prepare-test + uses: ./.github/actions/prepare-test + with: + version: ${{ matrix.version }} + use-all-platform-bundle: 'false' + setup-kotlin: 'true' + - name: Install @actions/tool-cache + run: npm install @actions/tool-cache + - name: Check toolcache contains CodeQL + continue-on-error: true + uses: actions/github-script@v8 + with: + script: | + const toolcache = require('@actions/tool-cache'); + const allCodeqlVersions = toolcache.findAllVersions('CodeQL'); + if (allCodeqlVersions.length === 0) { + throw new Error(`CodeQL could not be found in the toolcache`); + } + - id: init + uses: ./../action/init + with: + languages: javascript + tools: ${{ steps.prepare-test.outputs.tools-url }} + - name: Check CodeQL is installed within the toolcache + uses: actions/github-script@v8 + with: + script: | + const toolcache = require('@actions/tool-cache'); + const allCodeqlVersions = toolcache.findAllVersions('CodeQL'); + console.log(`Found CodeQL versions: ${allCodeqlVersions}`); + if (allCodeqlVersions.length === 0) { + throw new Error('CodeQL not found in toolcache'); + } + env: + CODEQL_ACTION_TEST_MODE: true diff --git a/pr-checks/checks/bundle-from-toolcache.yml b/pr-checks/checks/bundle-from-toolcache.yml new file mode 100644 index 0000000000..5a53ec12d9 --- /dev/null +++ b/pr-checks/checks/bundle-from-toolcache.yml @@ -0,0 +1,32 @@ +name: "Bundle: From toolcache" +description: "The CodeQL bundle should be cached within the toolcache" +versions: + - toolcache +steps: + - name: Install @actions/tool-cache + run: npm install @actions/tool-cache + - name: Check toolcache contains CodeQL + continue-on-error: true + uses: actions/github-script@v8 + with: + script: | + const toolcache = require('@actions/tool-cache'); + const allCodeqlVersions = toolcache.findAllVersions('CodeQL'); + if (allCodeqlVersions.length === 0) { + throw new Error(`CodeQL could not be found in the toolcache`); + } + - id: init + uses: ./../action/init + with: + languages: javascript + tools: ${{ steps.prepare-test.outputs.tools-url }} + - name: Check CodeQL is installed within the toolcache + uses: actions/github-script@v8 + with: + script: | + const toolcache = require('@actions/tool-cache'); + const allCodeqlVersions = toolcache.findAllVersions('CodeQL'); + console.log(`Found CodeQL versions: ${allCodeqlVersions}`); + if (allCodeqlVersions.length === 0) { + throw new Error('CodeQL not found in toolcache'); + } From 4d0c164f60f6d3a2e757c80c66857d687506d062 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 6 Oct 2025 12:53:17 +0100 Subject: [PATCH 5/8] Remove `toolcache` option description from `action.yml` --- init/action.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/init/action.yml b/init/action.yml index 5b2baaeca9..ba5d6efcc1 100644 --- a/init/action.yml +++ b/init/action.yml @@ -15,8 +15,6 @@ inputs: - A special value `nightly` which uses the latest nightly version of the CodeQL tools. Note that this is unstable and not recommended for production use. - - A special value `toolcache` which uses the latest version available in the - toolcache on the runner. If not specified, the Action will check in several places until it finds the CodeQL tools. From 43ce7ef39920f9ecce40b7b9aecf0224e866e584 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 6 Oct 2025 12:55:54 +0100 Subject: [PATCH 6/8] Add `isDynamicWorkflow` function --- lib/analyze-action.js | 5 ++++- lib/init-action-post.js | 5 ++++- lib/init-action.js | 5 ++++- lib/upload-lib.js | 5 ++++- lib/upload-sarif-action.js | 5 ++++- src/actions-util.ts | 7 ++++++- 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index d0486873fa..963cd9366a 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -90039,9 +90039,12 @@ function getWorkflowRunAttempt() { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } -function isDefaultSetup() { +function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } +function isDefaultSetup() { + return isDynamicWorkflow(); +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } diff --git a/lib/init-action-post.js b/lib/init-action-post.js index c905b89bc5..73e221ccb2 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -128337,9 +128337,12 @@ function getWorkflowRunAttempt() { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } -function isDefaultSetup() { +function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } +function isDefaultSetup() { + return isDynamicWorkflow(); +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } diff --git a/lib/init-action.js b/lib/init-action.js index 32512e9df2..e3a96d0a75 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -85943,9 +85943,12 @@ var getFileType = async (filePath) => { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } -function isDefaultSetup() { +function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } +function isDefaultSetup() { + return isDynamicWorkflow(); +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } diff --git a/lib/upload-lib.js b/lib/upload-lib.js index e0cbdcbb59..030568f01c 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -88474,9 +88474,12 @@ function getWorkflowRunAttempt() { } return workflowRunAttempt; } -function isDefaultSetup() { +function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } +function isDefaultSetup() { + return isDynamicWorkflow(); +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index d8ec6eabe2..b58f1689e0 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -88671,9 +88671,12 @@ function getWorkflowRunAttempt() { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } -function isDefaultSetup() { +function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } +function isDefaultSetup() { + return isDynamicWorkflow(); +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } diff --git a/src/actions-util.ts b/src/actions-util.ts index 8058e5772d..a2d691b42d 100644 --- a/src/actions-util.ts +++ b/src/actions-util.ts @@ -247,9 +247,14 @@ export function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } +/** Determines whether the workflow trigger is `dynamic`. */ +export function isDynamicWorkflow(): boolean { + return getWorkflowEventName() === "dynamic"; +} + /** Determines whether we are running in default setup. */ export function isDefaultSetup(): boolean { - return getWorkflowEventName() === "dynamic"; + return isDynamicWorkflow(); } export function prettyPrintInvocation(cmd: string, args: string[]): string { From 1cc5eb663691cdc33687fa343c35ef7b22d1e723 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 6 Oct 2025 12:58:00 +0100 Subject: [PATCH 7/8] Use `semver.compare` instead of `semver.lt` --- lib/analyze-action-post.js | 138 ++++++++++++++-------------- lib/analyze-action.js | 134 +++++++++++++-------------- lib/autobuild-action.js | 126 +++++++++++++------------- lib/init-action-post.js | 146 +++++++++++++++--------------- lib/init-action.js | 132 +++++++++++++-------------- lib/resolve-environment-action.js | 126 +++++++++++++------------- lib/start-proxy-action-post.js | 138 ++++++++++++++-------------- lib/upload-lib.js | 134 +++++++++++++-------------- lib/upload-sarif-action-post.js | 138 ++++++++++++++-------------- lib/upload-sarif-action.js | 134 +++++++++++++-------------- src/setup-codeql.ts | 2 +- 11 files changed, 674 insertions(+), 674 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index bcc8753eb4..955d69185e 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -25121,8 +25121,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare; + var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare2; } }); @@ -25130,8 +25130,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var rcompare = (a, b, loose) => compare(b, a, loose); + var compare2 = require_compare(); + var rcompare = (a, b, loose) => compare2(b, a, loose); module2.exports = rcompare; } }); @@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var compareLoose = (a, b) => compare(a, b, true); + var compare2 = require_compare(); + var compareLoose = (a, b) => compare2(a, b, true); module2.exports = compareLoose; } }); @@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gt = (a, b, loose) => compare(a, b, loose) > 0; + var compare2 = require_compare(); + var gt = (a, b, loose) => compare2(a, b, loose) > 0; module2.exports = gt; } }); @@ -25194,9 +25194,9 @@ var require_gt = __commonJS({ 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 compare2 = require_compare(); + var lt = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt; } }); @@ -25204,8 +25204,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var eq = (a, b, loose) => compare(a, b, loose) === 0; + var compare2 = require_compare(); + var eq = (a, b, loose) => compare2(a, b, loose) === 0; module2.exports = eq; } }); @@ -25214,8 +25214,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var neq = (a, b, loose) => compare(a, b, loose) !== 0; + var compare2 = require_compare(); + var neq = (a, b, loose) => compare2(a, b, loose) !== 0; module2.exports = neq; } }); @@ -25224,8 +25224,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gte5 = (a, b, loose) => compare(a, b, loose) >= 0; + var compare2 = require_compare(); + var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -25234,8 +25234,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lte = (a, b, loose) => compare(a, b, loose) <= 0; + var compare2 = require_compare(); + var lte = (a, b, loose) => compare2(a, b, loose) <= 0; module2.exports = lte; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare(a, b, options)); + const v = versions.sort((a, b) => compare2(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -26184,7 +26184,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare2(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26324,14 +26324,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare = require_compare(); + var compare2 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare, + compare: compare2, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare; - function compare(a, b, loose) { + exports2.compare = compare2; + function compare2(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare(a, b, true); + return compare2(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare(b, a, loose); + return compare2(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare(a, b, loose) > 0; + return compare2(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare2(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare(a, b, loose) === 0; + return compare2(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare(a, b, loose) !== 0; + return compare2(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare(a, b, loose) >= 0; + return compare2(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare(a, b, loose) <= 0; + return compare2(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -95823,8 +95823,8 @@ var require_commonjs16 = __commonJS({ if (rootPath === this.root.name) { return this.root; } - for (const [compare, root] of Object.entries(this.roots)) { - if (this.sameRoot(rootPath, compare)) { + for (const [compare2, root] of Object.entries(this.roots)) { + if (this.sameRoot(rootPath, compare2)) { return this.roots[rootPath] = root; } } @@ -95833,9 +95833,9 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - sameRoot(rootPath, compare = this.root.name) { + sameRoot(rootPath, compare2 = this.root.name) { rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\"); - return rootPath === compare; + return rootPath === compare2; } }; exports2.PathWin32 = PathWin32; @@ -99854,7 +99854,7 @@ var require_b4a = __commonJS({ function byteLength(string, encoding) { return Buffer.byteLength(string, encoding); } - function compare(a, b) { + function compare2(a, b) { return Buffer.compare(a, b); } function concat(buffers, totalLength) { @@ -99955,7 +99955,7 @@ var require_b4a = __commonJS({ allocUnsafe, allocUnsafeSlow, byteLength, - compare, + compare: compare2, concat, copy, equals, diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 963cd9366a..77db2a754d 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -25039,7 +25039,7 @@ var require_to_regex_range = __commonJS({ stop = countZeros(max + 1, zeros) - 1; } stops = [...stops]; - stops.sort(compare2); + stops.sort(compare3); return stops; } function rangeToPattern(start, stop, options) { @@ -25111,7 +25111,7 @@ var require_to_regex_range = __commonJS({ for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]); return arr; } - function compare2(a, b) { + function compare3(a, b) { return a > b ? 1 : b > a ? -1 : 0; } function contains(arr, key, val2) { @@ -30970,8 +30970,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare2; + var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare3; } }); @@ -30979,8 +30979,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var rcompare = (a, b, loose) => compare2(b, a, loose); + var compare3 = require_compare(); + var rcompare = (a, b, loose) => compare3(b, a, loose); module2.exports = rcompare; } }); @@ -30989,8 +30989,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var compareLoose = (a, b) => compare2(a, b, true); + var compare3 = require_compare(); + var compareLoose = (a, b) => compare3(a, b, true); module2.exports = compareLoose; } }); @@ -31033,8 +31033,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gt = (a, b, loose) => compare2(a, b, loose) > 0; + var compare3 = require_compare(); + var gt = (a, b, loose) => compare3(a, b, loose) > 0; module2.exports = gt; } }); @@ -31043,9 +31043,9 @@ var require_gt = __commonJS({ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt2; + var compare3 = require_compare(); + var lt = (a, b, loose) => compare3(a, b, loose) < 0; + module2.exports = lt; } }); @@ -31053,8 +31053,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var eq = (a, b, loose) => compare2(a, b, loose) === 0; + var compare3 = require_compare(); + var eq = (a, b, loose) => compare3(a, b, loose) === 0; module2.exports = eq; } }); @@ -31063,8 +31063,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var neq = (a, b, loose) => compare2(a, b, loose) !== 0; + var compare3 = require_compare(); + var neq = (a, b, loose) => compare3(a, b, loose) !== 0; module2.exports = neq; } }); @@ -31073,8 +31073,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; + var compare3 = require_compare(); + var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -31083,8 +31083,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lte = (a, b, loose) => compare2(a, b, loose) <= 0; + var compare3 = require_compare(); + var lte = (a, b, loose) => compare3(a, b, loose) <= 0; module2.exports = lte; } }); @@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -31980,12 +31980,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare2(a, b, options)); + const v = versions.sort((a, b) => compare3(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -32033,7 +32033,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -32078,12 +32078,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -32092,11 +32092,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare2(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare3(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -32104,7 +32104,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -32116,9 +32116,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -32139,29 +32139,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -32173,14 +32173,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -32204,14 +32204,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare2 = require_compare(); + var compare3 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -32242,14 +32242,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare: compare2, + compare: compare3, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare2; - function compare2(a, b, loose) { + exports2.compare = compare3; + function compare3(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare2(a, b, true); + return compare3(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare2(b, a, loose); + return compare3(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare2(a, b, loose) > 0; + return compare3(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare2(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare3(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare2(a, b, loose) === 0; + return compare3(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare2(a, b, loose) !== 0; + return compare3(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare2(a, b, loose) >= 0; + return compare3(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare2(a, b, loose) <= 0; + return compare3(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(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 = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -92614,7 +92614,7 @@ async function getNightlyToolsUrl(logger) { } } function getLatestToolcacheVersion(logger) { - const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a)); logger.debug( `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( allVersions @@ -94798,7 +94798,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) { }; LongPrototype.gte = LongPrototype.greaterThanOrEqual; LongPrototype.ge = LongPrototype.greaterThanOrEqual; -LongPrototype.compare = function compare(other) { +LongPrototype.compare = function compare2(other) { if (!isLong(other)) other = fromValue(other); if (this.eq(other)) return 0; var thisNeg = this.isNegative(), otherNeg = other.isNegative(); diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 3f5c705517..74dee6cb82 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -25121,8 +25121,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare; + var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare2; } }); @@ -25130,8 +25130,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var rcompare = (a, b, loose) => compare(b, a, loose); + var compare2 = require_compare(); + var rcompare = (a, b, loose) => compare2(b, a, loose); module2.exports = rcompare; } }); @@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var compareLoose = (a, b) => compare(a, b, true); + var compare2 = require_compare(); + var compareLoose = (a, b) => compare2(a, b, true); module2.exports = compareLoose; } }); @@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gt = (a, b, loose) => compare(a, b, loose) > 0; + var compare2 = require_compare(); + var gt = (a, b, loose) => compare2(a, b, loose) > 0; module2.exports = gt; } }); @@ -25194,9 +25194,9 @@ var require_gt = __commonJS({ 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 compare2 = require_compare(); + var lt = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt; } }); @@ -25204,8 +25204,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var eq = (a, b, loose) => compare(a, b, loose) === 0; + var compare2 = require_compare(); + var eq = (a, b, loose) => compare2(a, b, loose) === 0; module2.exports = eq; } }); @@ -25214,8 +25214,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var neq = (a, b, loose) => compare(a, b, loose) !== 0; + var compare2 = require_compare(); + var neq = (a, b, loose) => compare2(a, b, loose) !== 0; module2.exports = neq; } }); @@ -25224,8 +25224,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gte5 = (a, b, loose) => compare(a, b, loose) >= 0; + var compare2 = require_compare(); + var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -25234,8 +25234,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lte = (a, b, loose) => compare(a, b, loose) <= 0; + var compare2 = require_compare(); + var lte = (a, b, loose) => compare2(a, b, loose) <= 0; module2.exports = lte; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare(a, b, options)); + const v = versions.sort((a, b) => compare2(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -26184,7 +26184,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare2(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26324,14 +26324,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare = require_compare(); + var compare2 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare, + compare: compare2, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare; - function compare(a, b, loose) { + exports2.compare = compare2; + function compare2(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare(a, b, true); + return compare2(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare(b, a, loose); + return compare2(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare(a, b, loose) > 0; + return compare2(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare2(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare(a, b, loose) === 0; + return compare2(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare(a, b, loose) !== 0; + return compare2(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare(a, b, loose) >= 0; + return compare2(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare(a, b, loose) <= 0; + return compare2(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 73e221ccb2..d2b206bdfa 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -25039,7 +25039,7 @@ var require_to_regex_range = __commonJS({ stop = countZeros(max + 1, zeros) - 1; } stops = [...stops]; - stops.sort(compare2); + stops.sort(compare3); return stops; } function rangeToPattern(start, stop, options) { @@ -25111,7 +25111,7 @@ var require_to_regex_range = __commonJS({ for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]); return arr; } - function compare2(a, b) { + function compare3(a, b) { return a > b ? 1 : b > a ? -1 : 0; } function contains(arr, key, val2) { @@ -30970,8 +30970,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare2; + var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare3; } }); @@ -30979,8 +30979,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var rcompare = (a, b, loose) => compare2(b, a, loose); + var compare3 = require_compare(); + var rcompare = (a, b, loose) => compare3(b, a, loose); module2.exports = rcompare; } }); @@ -30989,8 +30989,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var compareLoose = (a, b) => compare2(a, b, true); + var compare3 = require_compare(); + var compareLoose = (a, b) => compare3(a, b, true); module2.exports = compareLoose; } }); @@ -31033,8 +31033,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gt = (a, b, loose) => compare2(a, b, loose) > 0; + var compare3 = require_compare(); + var gt = (a, b, loose) => compare3(a, b, loose) > 0; module2.exports = gt; } }); @@ -31043,9 +31043,9 @@ var require_gt = __commonJS({ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt2; + var compare3 = require_compare(); + var lt = (a, b, loose) => compare3(a, b, loose) < 0; + module2.exports = lt; } }); @@ -31053,8 +31053,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var eq = (a, b, loose) => compare2(a, b, loose) === 0; + var compare3 = require_compare(); + var eq = (a, b, loose) => compare3(a, b, loose) === 0; module2.exports = eq; } }); @@ -31063,8 +31063,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var neq = (a, b, loose) => compare2(a, b, loose) !== 0; + var compare3 = require_compare(); + var neq = (a, b, loose) => compare3(a, b, loose) !== 0; module2.exports = neq; } }); @@ -31073,8 +31073,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; + var compare3 = require_compare(); + var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -31083,8 +31083,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lte = (a, b, loose) => compare2(a, b, loose) <= 0; + var compare3 = require_compare(); + var lte = (a, b, loose) => compare3(a, b, loose) <= 0; module2.exports = lte; } }); @@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -31980,12 +31980,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare2(a, b, options)); + const v = versions.sort((a, b) => compare3(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -32033,7 +32033,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -32078,12 +32078,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -32092,11 +32092,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare2(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare3(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -32104,7 +32104,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -32116,9 +32116,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -32139,29 +32139,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -32173,14 +32173,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -32204,14 +32204,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare2 = require_compare(); + var compare3 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -32242,14 +32242,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare: compare2, + compare: compare3, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare2; - function compare2(a, b, loose) { + exports2.compare = compare3; + function compare3(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare2(a, b, true); + return compare3(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare2(b, a, loose); + return compare3(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare2(a, b, loose) > 0; + return compare3(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare2(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare3(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare2(a, b, loose) === 0; + return compare3(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare2(a, b, loose) !== 0; + return compare3(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare2(a, b, loose) >= 0; + return compare3(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare2(a, b, loose) <= 0; + return compare3(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(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 = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -101672,8 +101672,8 @@ var require_commonjs16 = __commonJS({ if (rootPath === this.root.name) { return this.root; } - for (const [compare2, root] of Object.entries(this.roots)) { - if (this.sameRoot(rootPath, compare2)) { + for (const [compare3, root] of Object.entries(this.roots)) { + if (this.sameRoot(rootPath, compare3)) { return this.roots[rootPath] = root; } } @@ -101682,9 +101682,9 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - sameRoot(rootPath, compare2 = this.root.name) { + sameRoot(rootPath, compare3 = this.root.name) { rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\"); - return rootPath === compare2; + return rootPath === compare3; } }; exports2.PathWin32 = PathWin32; @@ -105703,7 +105703,7 @@ var require_b4a = __commonJS({ function byteLength(string, encoding) { return Buffer.byteLength(string, encoding); } - function compare2(a, b) { + function compare3(a, b) { return Buffer.compare(a, b); } function concat(buffers, totalLength) { @@ -105804,7 +105804,7 @@ var require_b4a = __commonJS({ allocUnsafe, allocUnsafeSlow, byteLength, - compare: compare2, + compare: compare3, concat, copy, equals: equals2, @@ -130596,7 +130596,7 @@ async function getNightlyToolsUrl(logger) { } } function getLatestToolcacheVersion(logger) { - const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a)); logger.debug( `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( allVersions @@ -132274,7 +132274,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) { }; LongPrototype.gte = LongPrototype.greaterThanOrEqual; LongPrototype.ge = LongPrototype.greaterThanOrEqual; -LongPrototype.compare = function compare(other) { +LongPrototype.compare = function compare2(other) { if (!isLong(other)) other = fromValue(other); if (this.eq(other)) return 0; var thisNeg = this.isNegative(), otherNeg = other.isNegative(); diff --git a/lib/init-action.js b/lib/init-action.js index e3a96d0a75..b22dbec7ad 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -20412,8 +20412,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare; + var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare2; } }); @@ -20421,8 +20421,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var rcompare = (a, b, loose) => compare(b, a, loose); + var compare2 = require_compare(); + var rcompare = (a, b, loose) => compare2(b, a, loose); module2.exports = rcompare; } }); @@ -20431,8 +20431,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var compareLoose = (a, b) => compare(a, b, true); + var compare2 = require_compare(); + var compareLoose = (a, b) => compare2(a, b, true); module2.exports = compareLoose; } }); @@ -20475,8 +20475,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gt = (a, b, loose) => compare(a, b, loose) > 0; + var compare2 = require_compare(); + var gt = (a, b, loose) => compare2(a, b, loose) > 0; module2.exports = gt; } }); @@ -20485,9 +20485,9 @@ var require_gt = __commonJS({ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lt3 = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt3; + var compare2 = require_compare(); + var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -20495,8 +20495,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var eq = (a, b, loose) => compare(a, b, loose) === 0; + var compare2 = require_compare(); + var eq = (a, b, loose) => compare2(a, b, loose) === 0; module2.exports = eq; } }); @@ -20505,8 +20505,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var neq = (a, b, loose) => compare(a, b, loose) !== 0; + var compare2 = require_compare(); + var neq = (a, b, loose) => compare2(a, b, loose) !== 0; module2.exports = neq; } }); @@ -20515,8 +20515,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gte5 = (a, b, loose) => compare(a, b, loose) >= 0; + var compare2 = require_compare(); + var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -20525,8 +20525,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lte = (a, b, loose) => compare(a, b, loose) <= 0; + var compare2 = require_compare(); + var lte = (a, b, loose) => compare2(a, b, loose) <= 0; module2.exports = lte; } }); @@ -20539,7 +20539,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt3 = require_lt(); + var lt2 = 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 lt3(a, b, loose); + return lt2(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 lt3 = require_lt(); + var lt2 = 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 = lt3; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt3; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -21422,12 +21422,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare(a, b, options)); + const v = versions.sort((a, b) => compare2(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -21475,7 +21475,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -21520,12 +21520,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt3; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt3 = lowerLT(lt3, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -21534,11 +21534,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt3) { - gtltComp = compare(gt.semver, lt3.semver, options); + if (gt && lt2) { + gtltComp = compare2(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt3.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -21546,7 +21546,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt3 && !satisfies2(eq, String(lt3), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -21558,9 +21558,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt3 && !options.includePrerelease && lt3.semver.prerelease.length ? lt3.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 && lt3.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -21581,29 +21581,29 @@ var require_subset = __commonJS({ return false; } } - if (lt3) { + 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(lt3, c, options); - if (lower === c && lower !== lt3) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt3.operator === "<=" && !satisfies2(lt3.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt3 || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt3 && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt3 && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -21615,14 +21615,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -21646,14 +21646,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare = require_compare(); + var compare2 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt3 = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -21684,14 +21684,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare, + compare: compare2, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt3, + lt: lt2, eq, neq, gte: gte5, @@ -26947,7 +26947,7 @@ var require_to_regex_range = __commonJS({ stop = countZeros(max + 1, zeros) - 1; } stops = [...stops]; - stops.sort(compare); + stops.sort(compare2); return stops; } function rangeToPattern(start, stop, options) { @@ -27019,7 +27019,7 @@ var require_to_regex_range = __commonJS({ for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]); return arr; } - function compare(a, b) { + function compare2(a, b) { return a > b ? 1 : b > a ? -1 : 0; } function contains(arr, key, val2) { @@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare; - function compare(a, b, loose) { + exports2.compare = compare2; + function compare2(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare(a, b, true); + return compare2(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare(b, a, loose); + return compare2(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare(a, b, loose) > 0; + return compare2(a, b, loose) > 0; } - exports2.lt = lt3; - function lt3(a, b, loose) { - return compare(a, b, loose) < 0; + exports2.lt = lt2; + function lt2(a, b, loose) { + return compare2(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare(a, b, loose) === 0; + return compare2(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare(a, b, loose) !== 0; + return compare2(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare(a, b, loose) >= 0; + return compare2(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare(a, b, loose) <= 0; + return compare2(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt3(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 = lt3; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt3; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -89389,7 +89389,7 @@ async function getNightlyToolsUrl(logger) { } } function getLatestToolcacheVersion(logger) { - const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a)); logger.debug( `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( allVersions diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 2a9c4102b7..84807b350f 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -25121,8 +25121,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare; + var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare2; } }); @@ -25130,8 +25130,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var rcompare = (a, b, loose) => compare(b, a, loose); + var compare2 = require_compare(); + var rcompare = (a, b, loose) => compare2(b, a, loose); module2.exports = rcompare; } }); @@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var compareLoose = (a, b) => compare(a, b, true); + var compare2 = require_compare(); + var compareLoose = (a, b) => compare2(a, b, true); module2.exports = compareLoose; } }); @@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gt = (a, b, loose) => compare(a, b, loose) > 0; + var compare2 = require_compare(); + var gt = (a, b, loose) => compare2(a, b, loose) > 0; module2.exports = gt; } }); @@ -25194,9 +25194,9 @@ var require_gt = __commonJS({ 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 compare2 = require_compare(); + var lt = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt; } }); @@ -25204,8 +25204,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var eq = (a, b, loose) => compare(a, b, loose) === 0; + var compare2 = require_compare(); + var eq = (a, b, loose) => compare2(a, b, loose) === 0; module2.exports = eq; } }); @@ -25214,8 +25214,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var neq = (a, b, loose) => compare(a, b, loose) !== 0; + var compare2 = require_compare(); + var neq = (a, b, loose) => compare2(a, b, loose) !== 0; module2.exports = neq; } }); @@ -25224,8 +25224,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gte5 = (a, b, loose) => compare(a, b, loose) >= 0; + var compare2 = require_compare(); + var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -25234,8 +25234,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lte = (a, b, loose) => compare(a, b, loose) <= 0; + var compare2 = require_compare(); + var lte = (a, b, loose) => compare2(a, b, loose) <= 0; module2.exports = lte; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare(a, b, options)); + const v = versions.sort((a, b) => compare2(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -26184,7 +26184,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare2(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26324,14 +26324,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare = require_compare(); + var compare2 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare, + compare: compare2, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare; - function compare(a, b, loose) { + exports2.compare = compare2; + function compare2(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare(a, b, true); + return compare2(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare(b, a, loose); + return compare2(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare(a, b, loose) > 0; + return compare2(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare2(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare(a, b, loose) === 0; + return compare2(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare(a, b, loose) !== 0; + return compare2(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare(a, b, loose) >= 0; + return compare2(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare(a, b, loose) <= 0; + return compare2(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index d9a7163aef..018efc97f5 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -25121,8 +25121,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare; + var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare2; } }); @@ -25130,8 +25130,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var rcompare = (a, b, loose) => compare(b, a, loose); + var compare2 = require_compare(); + var rcompare = (a, b, loose) => compare2(b, a, loose); module2.exports = rcompare; } }); @@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var compareLoose = (a, b) => compare(a, b, true); + var compare2 = require_compare(); + var compareLoose = (a, b) => compare2(a, b, true); module2.exports = compareLoose; } }); @@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gt = (a, b, loose) => compare(a, b, loose) > 0; + var compare2 = require_compare(); + var gt = (a, b, loose) => compare2(a, b, loose) > 0; module2.exports = gt; } }); @@ -25194,9 +25194,9 @@ var require_gt = __commonJS({ 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 compare2 = require_compare(); + var lt = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt; } }); @@ -25204,8 +25204,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var eq = (a, b, loose) => compare(a, b, loose) === 0; + var compare2 = require_compare(); + var eq = (a, b, loose) => compare2(a, b, loose) === 0; module2.exports = eq; } }); @@ -25214,8 +25214,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var neq = (a, b, loose) => compare(a, b, loose) !== 0; + var compare2 = require_compare(); + var neq = (a, b, loose) => compare2(a, b, loose) !== 0; module2.exports = neq; } }); @@ -25224,8 +25224,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gte5 = (a, b, loose) => compare(a, b, loose) >= 0; + var compare2 = require_compare(); + var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -25234,8 +25234,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lte = (a, b, loose) => compare(a, b, loose) <= 0; + var compare2 = require_compare(); + var lte = (a, b, loose) => compare2(a, b, loose) <= 0; module2.exports = lte; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare(a, b, options)); + const v = versions.sort((a, b) => compare2(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -26184,7 +26184,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare2(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26324,14 +26324,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare = require_compare(); + var compare2 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare, + compare: compare2, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare; - function compare(a, b, loose) { + exports2.compare = compare2; + function compare2(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare(a, b, true); + return compare2(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare(b, a, loose); + return compare2(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare(a, b, loose) > 0; + return compare2(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare2(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare(a, b, loose) === 0; + return compare2(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare(a, b, loose) !== 0; + return compare2(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare(a, b, loose) >= 0; + return compare2(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare(a, b, loose) <= 0; + return compare2(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -94483,8 +94483,8 @@ var require_commonjs16 = __commonJS({ if (rootPath === this.root.name) { return this.root; } - for (const [compare, root] of Object.entries(this.roots)) { - if (this.sameRoot(rootPath, compare)) { + for (const [compare2, root] of Object.entries(this.roots)) { + if (this.sameRoot(rootPath, compare2)) { return this.roots[rootPath] = root; } } @@ -94493,9 +94493,9 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - sameRoot(rootPath, compare = this.root.name) { + sameRoot(rootPath, compare2 = this.root.name) { rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\"); - return rootPath === compare; + return rootPath === compare2; } }; exports2.PathWin32 = PathWin32; @@ -98514,7 +98514,7 @@ var require_b4a = __commonJS({ function byteLength(string, encoding) { return Buffer.byteLength(string, encoding); } - function compare(a, b) { + function compare2(a, b) { return Buffer.compare(a, b); } function concat(buffers, totalLength) { @@ -98615,7 +98615,7 @@ var require_b4a = __commonJS({ allocUnsafe, allocUnsafeSlow, byteLength, - compare, + compare: compare2, concat, copy, equals, diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 030568f01c..95316fbe67 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -26336,7 +26336,7 @@ var require_to_regex_range = __commonJS({ stop = countZeros(max + 1, zeros) - 1; } stops = [...stops]; - stops.sort(compare2); + stops.sort(compare3); return stops; } function rangeToPattern(start, stop, options) { @@ -26408,7 +26408,7 @@ var require_to_regex_range = __commonJS({ for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]); return arr; } - function compare2(a, b) { + function compare3(a, b) { return a > b ? 1 : b > a ? -1 : 0; } function contains(arr, key, val2) { @@ -32267,8 +32267,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare2; + var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare3; } }); @@ -32276,8 +32276,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var rcompare = (a, b, loose) => compare2(b, a, loose); + var compare3 = require_compare(); + var rcompare = (a, b, loose) => compare3(b, a, loose); module2.exports = rcompare; } }); @@ -32286,8 +32286,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var compareLoose = (a, b) => compare2(a, b, true); + var compare3 = require_compare(); + var compareLoose = (a, b) => compare3(a, b, true); module2.exports = compareLoose; } }); @@ -32330,8 +32330,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gt = (a, b, loose) => compare2(a, b, loose) > 0; + var compare3 = require_compare(); + var gt = (a, b, loose) => compare3(a, b, loose) > 0; module2.exports = gt; } }); @@ -32340,9 +32340,9 @@ var require_gt = __commonJS({ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt2; + var compare3 = require_compare(); + var lt = (a, b, loose) => compare3(a, b, loose) < 0; + module2.exports = lt; } }); @@ -32350,8 +32350,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var eq = (a, b, loose) => compare2(a, b, loose) === 0; + var compare3 = require_compare(); + var eq = (a, b, loose) => compare3(a, b, loose) === 0; module2.exports = eq; } }); @@ -32360,8 +32360,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var neq = (a, b, loose) => compare2(a, b, loose) !== 0; + var compare3 = require_compare(); + var neq = (a, b, loose) => compare3(a, b, loose) !== 0; module2.exports = neq; } }); @@ -32370,8 +32370,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; + var compare3 = require_compare(); + var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -32380,8 +32380,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lte = (a, b, loose) => compare2(a, b, loose) <= 0; + var compare3 = require_compare(); + var lte = (a, b, loose) => compare3(a, b, loose) <= 0; module2.exports = lte; } }); @@ -32394,7 +32394,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -33277,12 +33277,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare2(a, b, options)); + const v = versions.sort((a, b) => compare3(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -33330,7 +33330,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -33375,12 +33375,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -33389,11 +33389,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare2(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare3(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -33401,7 +33401,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -33413,9 +33413,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -33436,29 +33436,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -33470,14 +33470,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -33501,14 +33501,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare2 = require_compare(); + var compare3 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -33539,14 +33539,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare: compare2, + compare: compare3, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -37407,13 +37407,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare2; - function compare2(a, b, loose) { + exports2.compare = compare3; + function compare3(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare2(a, b, true); + return compare3(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -37423,7 +37423,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare2(b, a, loose); + return compare3(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -37439,27 +37439,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare2(a, b, loose) > 0; + return compare3(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare2(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare3(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare2(a, b, loose) === 0; + return compare3(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare2(a, b, loose) !== 0; + return compare3(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare2(a, b, loose) >= 0; + return compare3(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare2(a, b, loose) <= 0; + return compare3(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -37487,7 +37487,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -38024,12 +38024,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -90430,7 +90430,7 @@ async function getNightlyToolsUrl(logger) { } } function getLatestToolcacheVersion(logger) { - const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a)); logger.debug( `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( allVersions @@ -91633,7 +91633,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) { }; LongPrototype.gte = LongPrototype.greaterThanOrEqual; LongPrototype.ge = LongPrototype.greaterThanOrEqual; -LongPrototype.compare = function compare(other) { +LongPrototype.compare = function compare2(other) { if (!isLong(other)) other = fromValue(other); if (this.eq(other)) return 0; var thisNeg = this.isNegative(), otherNeg = other.isNegative(); diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index a0dc0ed196..3eff41a558 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -25121,8 +25121,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare; + var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare2; } }); @@ -25130,8 +25130,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var rcompare = (a, b, loose) => compare(b, a, loose); + var compare2 = require_compare(); + var rcompare = (a, b, loose) => compare2(b, a, loose); module2.exports = rcompare; } }); @@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var compareLoose = (a, b) => compare(a, b, true); + var compare2 = require_compare(); + var compareLoose = (a, b) => compare2(a, b, true); module2.exports = compareLoose; } }); @@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gt = (a, b, loose) => compare(a, b, loose) > 0; + var compare2 = require_compare(); + var gt = (a, b, loose) => compare2(a, b, loose) > 0; module2.exports = gt; } }); @@ -25194,9 +25194,9 @@ var require_gt = __commonJS({ 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 compare2 = require_compare(); + var lt = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt; } }); @@ -25204,8 +25204,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var eq = (a, b, loose) => compare(a, b, loose) === 0; + var compare2 = require_compare(); + var eq = (a, b, loose) => compare2(a, b, loose) === 0; module2.exports = eq; } }); @@ -25214,8 +25214,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var neq = (a, b, loose) => compare(a, b, loose) !== 0; + var compare2 = require_compare(); + var neq = (a, b, loose) => compare2(a, b, loose) !== 0; module2.exports = neq; } }); @@ -25224,8 +25224,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var gte5 = (a, b, loose) => compare(a, b, loose) >= 0; + var compare2 = require_compare(); + var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -25234,8 +25234,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare = require_compare(); - var lte = (a, b, loose) => compare(a, b, loose) <= 0; + var compare2 = require_compare(); + var lte = (a, b, loose) => compare2(a, b, loose) <= 0; module2.exports = lte; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare(a, b, options)); + const v = versions.sort((a, b) => compare2(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -26184,7 +26184,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare = require_compare(); + var compare2 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare2(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26324,14 +26324,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare(a.semver, b.semver, options); + const comp = compare2(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare = require_compare(); + var compare2 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare, + compare: compare2, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -88567,8 +88567,8 @@ var require_commonjs16 = __commonJS({ if (rootPath === this.root.name) { return this.root; } - for (const [compare, root] of Object.entries(this.roots)) { - if (this.sameRoot(rootPath, compare)) { + for (const [compare2, root] of Object.entries(this.roots)) { + if (this.sameRoot(rootPath, compare2)) { return this.roots[rootPath] = root; } } @@ -88577,9 +88577,9 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - sameRoot(rootPath, compare = this.root.name) { + sameRoot(rootPath, compare2 = this.root.name) { rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\"); - return rootPath === compare; + return rootPath === compare2; } }; exports2.PathWin32 = PathWin32; @@ -92598,7 +92598,7 @@ var require_b4a = __commonJS({ function byteLength(string, encoding) { return Buffer.byteLength(string, encoding); } - function compare(a, b) { + function compare2(a, b) { return Buffer.compare(a, b); } function concat(buffers, totalLength) { @@ -92699,7 +92699,7 @@ var require_b4a = __commonJS({ allocUnsafe, allocUnsafeSlow, byteLength, - compare, + compare: compare2, concat, copy, equals, @@ -108085,13 +108085,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare; - function compare(a, b, loose) { + exports2.compare = compare2; + function compare2(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare(a, b, true); + return compare2(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -108101,7 +108101,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare(b, a, loose); + return compare2(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -108117,27 +108117,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare(a, b, loose) > 0; + return compare2(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare2(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare(a, b, loose) === 0; + return compare2(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare(a, b, loose) !== 0; + return compare2(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare(a, b, loose) >= 0; + return compare2(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare(a, b, loose) <= 0; + return compare2(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -108165,7 +108165,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -108702,12 +108702,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index b58f1689e0..7fa50945e0 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -25039,7 +25039,7 @@ var require_to_regex_range = __commonJS({ stop = countZeros(max + 1, zeros) - 1; } stops = [...stops]; - stops.sort(compare2); + stops.sort(compare3); return stops; } function rangeToPattern(start, stop, options) { @@ -25111,7 +25111,7 @@ var require_to_regex_range = __commonJS({ for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]); return arr; } - function compare2(a, b) { + function compare3(a, b) { return a > b ? 1 : b > a ? -1 : 0; } function contains(arr, key, val2) { @@ -30970,8 +30970,8 @@ var require_compare = __commonJS({ "node_modules/semver/functions/compare.js"(exports2, module2) { "use strict"; var SemVer = require_semver(); - var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); - module2.exports = compare2; + var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose)); + module2.exports = compare3; } }); @@ -30979,8 +30979,8 @@ var require_compare = __commonJS({ var require_rcompare = __commonJS({ "node_modules/semver/functions/rcompare.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var rcompare = (a, b, loose) => compare2(b, a, loose); + var compare3 = require_compare(); + var rcompare = (a, b, loose) => compare3(b, a, loose); module2.exports = rcompare; } }); @@ -30989,8 +30989,8 @@ var require_rcompare = __commonJS({ var require_compare_loose = __commonJS({ "node_modules/semver/functions/compare-loose.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var compareLoose = (a, b) => compare2(a, b, true); + var compare3 = require_compare(); + var compareLoose = (a, b) => compare3(a, b, true); module2.exports = compareLoose; } }); @@ -31033,8 +31033,8 @@ var require_rsort = __commonJS({ var require_gt = __commonJS({ "node_modules/semver/functions/gt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gt = (a, b, loose) => compare2(a, b, loose) > 0; + var compare3 = require_compare(); + var gt = (a, b, loose) => compare3(a, b, loose) > 0; module2.exports = gt; } }); @@ -31043,9 +31043,9 @@ var require_gt = __commonJS({ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt2; + var compare3 = require_compare(); + var lt = (a, b, loose) => compare3(a, b, loose) < 0; + module2.exports = lt; } }); @@ -31053,8 +31053,8 @@ var require_lt = __commonJS({ var require_eq = __commonJS({ "node_modules/semver/functions/eq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var eq = (a, b, loose) => compare2(a, b, loose) === 0; + var compare3 = require_compare(); + var eq = (a, b, loose) => compare3(a, b, loose) === 0; module2.exports = eq; } }); @@ -31063,8 +31063,8 @@ var require_eq = __commonJS({ var require_neq = __commonJS({ "node_modules/semver/functions/neq.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var neq = (a, b, loose) => compare2(a, b, loose) !== 0; + var compare3 = require_compare(); + var neq = (a, b, loose) => compare3(a, b, loose) !== 0; module2.exports = neq; } }); @@ -31073,8 +31073,8 @@ var require_neq = __commonJS({ var require_gte = __commonJS({ "node_modules/semver/functions/gte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0; + var compare3 = require_compare(); + var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0; module2.exports = gte5; } }); @@ -31083,8 +31083,8 @@ var require_gte = __commonJS({ var require_lte = __commonJS({ "node_modules/semver/functions/lte.js"(exports2, module2) { "use strict"; - var compare2 = require_compare(); - var lte = (a, b, loose) => compare2(a, b, loose) <= 0; + var compare3 = require_compare(); + var lte = (a, b, loose) => compare3(a, b, loose) <= 0; module2.exports = lte; } }); @@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt = 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 lt2(a, b, loose); + return lt(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 lt2 = require_lt(); + var lt = 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 = lt2; + ltfn = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -31980,12 +31980,12 @@ var require_simplify = __commonJS({ "node_modules/semver/ranges/simplify.js"(exports2, module2) { "use strict"; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); module2.exports = (versions, range, options) => { const set2 = []; let first = null; let prev = null; - const v = versions.sort((a, b) => compare2(a, b, options)); + const v = versions.sort((a, b) => compare3(a, b, options)); for (const version of v) { const included = satisfies2(version, range, options); if (included) { @@ -32033,7 +32033,7 @@ var require_subset = __commonJS({ var Comparator = require_comparator(); var { ANY } = Comparator; var satisfies2 = require_satisfies(); - var compare2 = require_compare(); + var compare3 = require_compare(); var subset = (sub, dom, options = {}) => { if (sub === dom) { return true; @@ -32078,12 +32078,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt = lowerLT(lt, c, options); } else { eqSet.add(c.semver); } @@ -32092,11 +32092,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare2(gt.semver, lt2.semver, options); + if (gt && lt) { + gtltComp = compare3(gt.semver, lt.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { return null; } } @@ -32104,7 +32104,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt && !satisfies2(eq, String(lt), options)) { return null; } for (const c of dom) { @@ -32116,9 +32116,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -32139,29 +32139,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt) { 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(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt, c, options); + if (lower === c && lower !== lt) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -32173,14 +32173,14 @@ var require_subset = __commonJS({ if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a; }; var lowerLT = (a, b, options) => { if (!a) { return b; } - const comp = compare2(a.semver, b.semver, options); + const comp = compare3(a.semver, b.semver, options); return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a; }; module2.exports = subset; @@ -32204,14 +32204,14 @@ var require_semver2 = __commonJS({ var minor = require_minor(); var patch = require_patch(); var prerelease = require_prerelease(); - var compare2 = require_compare(); + var compare3 = require_compare(); var rcompare = require_rcompare(); var compareLoose = require_compare_loose(); var compareBuild = require_compare_build(); var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -32242,14 +32242,14 @@ var require_semver2 = __commonJS({ minor, patch, prerelease, - compare: compare2, + compare: compare3, rcompare, compareLoose, compareBuild, sort, rsort, gt, - lt: lt2, + lt, eq, neq, gte: gte5, @@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({ function patch(a, loose) { return new SemVer(a, loose).patch; } - exports2.compare = compare2; - function compare2(a, b, loose) { + exports2.compare = compare3; + function compare3(a, b, loose) { return new SemVer(a, loose).compare(new SemVer(b, loose)); } exports2.compareLoose = compareLoose; function compareLoose(a, b) { - return compare2(a, b, true); + return compare3(a, b, true); } exports2.compareBuild = compareBuild; function compareBuild(a, b, loose) { @@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({ } exports2.rcompare = rcompare; function rcompare(a, b, loose) { - return compare2(b, a, loose); + return compare3(b, a, loose); } exports2.sort = sort; function sort(list, loose) { @@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({ } exports2.gt = gt; function gt(a, b, loose) { - return compare2(a, b, loose) > 0; + return compare3(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { - return compare2(a, b, loose) < 0; + exports2.lt = lt; + function lt(a, b, loose) { + return compare3(a, b, loose) < 0; } exports2.eq = eq; function eq(a, b, loose) { - return compare2(a, b, loose) === 0; + return compare3(a, b, loose) === 0; } exports2.neq = neq; function neq(a, b, loose) { - return compare2(a, b, loose) !== 0; + return compare3(a, b, loose) !== 0; } exports2.gte = gte5; function gte5(a, b, loose) { - return compare2(a, b, loose) >= 0; + return compare3(a, b, loose) >= 0; } exports2.lte = lte; function lte(a, b, loose) { - return compare2(a, b, loose) <= 0; + return compare3(a, b, loose) <= 0; } exports2.cmp = cmp; function cmp(a, op, b, loose) { @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt(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 = lt; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt; ltefn = gte5; ltfn = gt; comp = "<"; @@ -91102,7 +91102,7 @@ async function getNightlyToolsUrl(logger) { } } function getLatestToolcacheVersion(logger) { - const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1); + const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a)); logger.debug( `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( allVersions @@ -92305,7 +92305,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) { }; LongPrototype.gte = LongPrototype.greaterThanOrEqual; LongPrototype.ge = LongPrototype.greaterThanOrEqual; -LongPrototype.compare = function compare(other) { +LongPrototype.compare = function compare2(other) { if (!isLong(other)) other = fromValue(other); if (this.eq(other)) return 0; var thisNeg = this.isNegative(), otherNeg = other.isNegative(); diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts index 5ae0c5fa35..43868f2530 100644 --- a/src/setup-codeql.ts +++ b/src/setup-codeql.ts @@ -848,7 +848,7 @@ async function getNightlyToolsUrl(logger: Logger) { export function getLatestToolcacheVersion(logger: Logger): string | undefined { const allVersions = toolcache .findAllVersions("CodeQL") - .sort((a, b) => (semver.lt(a, b) ? 1 : -1)); + .sort((a, b) => semver.compare(b, a)); logger.debug( `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( allVersions, From 726a341ed4837e1dce785aac864b13904ee3fea8 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 6 Oct 2025 13:16:03 +0100 Subject: [PATCH 8/8] Restrict when `tools: toolcache` can be used --- lib/analyze-action.js | 27 +++++++++++++++++------- lib/init-action-post.js | 27 +++++++++++++++++------- lib/init-action.js | 27 +++++++++++++++++------- lib/upload-lib.js | 27 +++++++++++++++++------- lib/upload-sarif-action.js | 27 +++++++++++++++++------- src/setup-codeql.test.ts | 4 ++++ src/setup-codeql.ts | 43 ++++++++++++++++++++++++++------------ 7 files changed, 129 insertions(+), 53 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 77db2a754d..2b79889f03 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -92294,16 +92294,27 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian ); } } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { - logger.info( - `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` - ); - const latestToolcacheVersion = getLatestToolcacheVersion(logger); - if (latestToolcacheVersion) { - cliVersion2 = latestToolcacheVersion; - } else { + let latestToolcacheVersion; + const allowToolcacheValue = isDynamicWorkflow() || isInTestMode(); + if (allowToolcacheValue) { logger.info( - `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` ); + latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } + } + if (latestToolcacheVersion === void 0) { + if (allowToolcacheValue) { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + } else { + logger.warning( + `Ignoring 'tools: ${toolsInput}' because the workflow was not triggered dynamically.` + ); + } cliVersion2 = defaultCliVersion.cliVersion; tagName = defaultCliVersion.tagName; } diff --git a/lib/init-action-post.js b/lib/init-action-post.js index d2b206bdfa..865a932b83 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -130276,16 +130276,27 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian ); } } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { - logger.info( - `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` - ); - const latestToolcacheVersion = getLatestToolcacheVersion(logger); - if (latestToolcacheVersion) { - cliVersion2 = latestToolcacheVersion; - } else { + let latestToolcacheVersion; + const allowToolcacheValue = isDynamicWorkflow() || isInTestMode(); + if (allowToolcacheValue) { logger.info( - `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` ); + latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } + } + if (latestToolcacheVersion === void 0) { + if (allowToolcacheValue) { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + } else { + logger.warning( + `Ignoring 'tools: ${toolsInput}' because the workflow was not triggered dynamically.` + ); + } cliVersion2 = defaultCliVersion.cliVersion; tagName = defaultCliVersion.tagName; } diff --git a/lib/init-action.js b/lib/init-action.js index b22dbec7ad..4484568a4b 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -89069,16 +89069,27 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian ); } } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { - logger.info( - `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` - ); - const latestToolcacheVersion = getLatestToolcacheVersion(logger); - if (latestToolcacheVersion) { - cliVersion2 = latestToolcacheVersion; - } else { + let latestToolcacheVersion; + const allowToolcacheValue = isDynamicWorkflow() || isInTestMode(); + if (allowToolcacheValue) { logger.info( - `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` ); + latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } + } + if (latestToolcacheVersion === void 0) { + if (allowToolcacheValue) { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + } else { + logger.warning( + `Ignoring 'tools: ${toolsInput}' because the workflow was not triggered dynamically.` + ); + } cliVersion2 = defaultCliVersion.cliVersion; tagName = defaultCliVersion.tagName; } diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 95316fbe67..7d3d294d40 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -90110,16 +90110,27 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian ); } } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { - logger.info( - `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` - ); - const latestToolcacheVersion = getLatestToolcacheVersion(logger); - if (latestToolcacheVersion) { - cliVersion2 = latestToolcacheVersion; - } else { + let latestToolcacheVersion; + const allowToolcacheValue = isDynamicWorkflow() || isInTestMode(); + if (allowToolcacheValue) { logger.info( - `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` ); + latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } + } + if (latestToolcacheVersion === void 0) { + if (allowToolcacheValue) { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + } else { + logger.warning( + `Ignoring 'tools: ${toolsInput}' because the workflow was not triggered dynamically.` + ); + } cliVersion2 = defaultCliVersion.cliVersion; tagName = defaultCliVersion.tagName; } diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 7fa50945e0..23c0466161 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -90782,16 +90782,27 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian ); } } else if (toolsInput !== void 0 && toolsInput === CODEQL_TOOLCACHE_INPUT) { - logger.info( - `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` - ); - const latestToolcacheVersion = getLatestToolcacheVersion(logger); - if (latestToolcacheVersion) { - cliVersion2 = latestToolcacheVersion; - } else { + let latestToolcacheVersion; + const allowToolcacheValue = isDynamicWorkflow() || isInTestMode(); + if (allowToolcacheValue) { logger.info( - `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.` ); + latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion2 = latestToolcacheVersion; + } + } + if (latestToolcacheVersion === void 0) { + if (allowToolcacheValue) { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...` + ); + } else { + logger.warning( + `Ignoring 'tools: ${toolsInput}' because the workflow was not triggered dynamically.` + ); + } cliVersion2 = defaultCliVersion.cliVersion; tagName = defaultCliVersion.tagName; } diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts index f2bb7efb4c..4e65c6edf4 100644 --- a/src/setup-codeql.test.ts +++ b/src/setup-codeql.test.ts @@ -259,6 +259,8 @@ test("getCodeQLSource correctly returns latest version from toolcache when tools const loggedMessages: LoggedMessage[] = []; const logger = getRecordingLogger(loggedMessages); + process.env["GITHUB_EVENT_NAME"] = "dynamic"; + const latestToolcacheVersion = "3.2.1"; const latestVersionPath = "/path/to/latest"; const testVersions = ["2.3.1", latestToolcacheVersion, "1.2.3"]; @@ -318,6 +320,8 @@ test("getCodeQLSource falls back to downloading the CLI if the toolcache doesn't const loggedMessages: LoggedMessage[] = []; const logger = getRecordingLogger(loggedMessages); + process.env["GITHUB_EVENT_NAME"] = "dynamic"; + const testVersions = []; const findAllVersionsStub = sinon .stub(toolcache, "findAllVersions") diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts index 43868f2530..e01037223a 100644 --- a/src/setup-codeql.ts +++ b/src/setup-codeql.ts @@ -7,7 +7,7 @@ import { default as deepEqual } from "fast-deep-equal"; import * as semver from "semver"; import { v4 as uuidV4 } from "uuid"; -import { isRunningLocalAction } from "./actions-util"; +import { isDynamicWorkflow, isRunningLocalAction } from "./actions-util"; import * as api from "./api-client"; import * as defaults from "./defaults.json"; import { @@ -351,20 +351,37 @@ export async function getCodeQLSource( toolsInput !== undefined && toolsInput === CODEQL_TOOLCACHE_INPUT ) { - // If `toolsInput === "toolcache"`, try to find the latest version of the CLI that's available in the toolcache - // and use that. We perform this check here since we can set `cliVersion` directly and don't want to default to - // the linked version. - logger.info( - `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.`, - ); - - const latestToolcacheVersion = getLatestToolcacheVersion(logger); - if (latestToolcacheVersion) { - cliVersion = latestToolcacheVersion; - } else { + let latestToolcacheVersion: string | undefined; + + // We only allow `toolsInput === "toolcache"` for `dynamic` events. In general, using `toolsInput === "toolcache"` + // can lead to alert wobble and so it shouldn't be used for an analysis where results are intended to be uploaded. + // We also allow this in test mode. + const allowToolcacheValue = isDynamicWorkflow() || util.isInTestMode(); + if (allowToolcacheValue) { + // If `toolsInput === "toolcache"`, try to find the latest version of the CLI that's available in the toolcache + // and use that. We perform this check here since we can set `cliVersion` directly and don't want to default to + // the linked version. logger.info( - `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...`, + `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by 'tools: ${toolsInput}'.`, ); + + latestToolcacheVersion = getLatestToolcacheVersion(logger); + if (latestToolcacheVersion) { + cliVersion = latestToolcacheVersion; + } + } + + if (latestToolcacheVersion === undefined) { + if (allowToolcacheValue) { + logger.info( + `Found no CodeQL CLI in the toolcache, ignoring 'tools: ${toolsInput}'...`, + ); + } else { + logger.warning( + `Ignoring 'tools: ${toolsInput}' because the workflow was not triggered dynamically.`, + ); + } + cliVersion = defaultCliVersion.cliVersion; tagName = defaultCliVersion.tagName; }