mirror of
https://github.com/github/codeql-action.git
synced 2026-10-03 17:41:28 +00:00
Merge branch 'main' into robertbrignull/waitForProcessing_backoff
This commit is contained in:
53
lib/entry-points.js
generated
53
lib/entry-points.js
generated
@@ -125031,7 +125031,7 @@ var require_tmp = __commonJS({
|
||||
cb(null, path28.join(parentDir, path28.basename(pathToResolve)));
|
||||
});
|
||||
} else {
|
||||
fs30.realpath(path28, cb);
|
||||
fs30.realpath(pathToResolve, cb);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -125063,16 +125063,31 @@ var require_tmp = __commonJS({
|
||||
].join("");
|
||||
return path28.join(tmpDir, opts.dir, name);
|
||||
}
|
||||
function _assertPath(option, value) {
|
||||
if (typeof value !== "string") {
|
||||
throw new Error(`${option} option must be a string, got "${typeof value}".`);
|
||||
}
|
||||
if (value.includes("..")) {
|
||||
throw new Error("Relative value not allowed");
|
||||
}
|
||||
return value;
|
||||
}
|
||||
function _assertOptionsBase(options) {
|
||||
if (!_isUndefined(options.name)) {
|
||||
const name = options.name;
|
||||
if (path28.isAbsolute(name)) throw new Error(`name option must not contain an absolute path, found "${name}".`);
|
||||
const basename2 = path28.basename(name);
|
||||
if (basename2 === ".." || basename2 === "." || basename2 !== name)
|
||||
if (basename2 === ".." || basename2 === "." || basename2 !== name) {
|
||||
throw new Error(`name option must not contain a path, found "${name}".`);
|
||||
}
|
||||
}
|
||||
if (!_isUndefined(options.template) && !options.template.match(TEMPLATE_PATTERN)) {
|
||||
throw new Error(`Invalid template, found "${options.template}".`);
|
||||
if (!_isUndefined(options.template)) {
|
||||
if (typeof options.template !== "string") {
|
||||
throw new Error(`template option must be a string, got "${typeof options.template}".`);
|
||||
}
|
||||
if (!options.template.match(TEMPLATE_PATTERN)) {
|
||||
throw new Error(`Invalid template, found "${options.template}".`);
|
||||
}
|
||||
}
|
||||
if (!_isUndefined(options.tries) && isNaN(options.tries) || options.tries < 0) {
|
||||
throw new Error(`Invalid tries, found "${options.tries}".`);
|
||||
@@ -125082,15 +125097,16 @@ var require_tmp = __commonJS({
|
||||
options.detachDescriptor = !!options.detachDescriptor;
|
||||
options.discardDescriptor = !!options.discardDescriptor;
|
||||
options.unsafeCleanup = !!options.unsafeCleanup;
|
||||
options.prefix = _isUndefined(options.prefix) ? "" : options.prefix;
|
||||
options.postfix = _isUndefined(options.postfix) ? "" : options.postfix;
|
||||
options.prefix = _isUndefined(options.prefix) ? "" : _assertPath("prefix", options.prefix);
|
||||
options.postfix = _isUndefined(options.postfix) ? "" : _assertPath("postfix", options.postfix);
|
||||
options.template = _isUndefined(options.template) ? void 0 : _assertPath("template", options.template);
|
||||
}
|
||||
function _getRelativePath(option, name, tmpDir, cb) {
|
||||
if (_isUndefined(name)) return cb(null);
|
||||
_resolvePath(name, tmpDir, function(err, resolvedPath) {
|
||||
if (err) return cb(err);
|
||||
const relativePath = path28.relative(tmpDir, resolvedPath);
|
||||
if (!resolvedPath.startsWith(tmpDir)) {
|
||||
if (relativePath.startsWith("..") || path28.isAbsolute(relativePath)) {
|
||||
return cb(new Error(`${option} option must be relative to "${tmpDir}", found "${relativePath}".`));
|
||||
}
|
||||
cb(null, relativePath);
|
||||
@@ -125100,7 +125116,7 @@ var require_tmp = __commonJS({
|
||||
if (_isUndefined(name)) return;
|
||||
const resolvedPath = _resolvePathSync(name, tmpDir);
|
||||
const relativePath = path28.relative(tmpDir, resolvedPath);
|
||||
if (!resolvedPath.startsWith(tmpDir)) {
|
||||
if (relativePath.startsWith("..") || path28.isAbsolute(relativePath)) {
|
||||
throw new Error(`${option} option must be relative to "${tmpDir}", found "${relativePath}".`);
|
||||
}
|
||||
return relativePath;
|
||||
@@ -147666,7 +147682,7 @@ var safeDump = renamed("safeDump", "dump");
|
||||
var semver = __toESM(require_semver2());
|
||||
|
||||
// src/api-compatibility.json
|
||||
var maximumVersion = "3.21";
|
||||
var maximumVersion = "3.22";
|
||||
var minimumVersion = "3.16";
|
||||
|
||||
// src/json/index.ts
|
||||
@@ -148350,7 +148366,7 @@ function getDiffRangesJsonFilePath() {
|
||||
return path2.join(getTemporaryDirectory(), PR_DIFF_RANGE_JSON_FILENAME);
|
||||
}
|
||||
function getActionVersion() {
|
||||
return "4.36.1";
|
||||
return "4.36.2";
|
||||
}
|
||||
function getWorkflowEventName() {
|
||||
return getRequiredEnvParam("GITHUB_EVENT_NAME");
|
||||
@@ -151695,6 +151711,7 @@ async function initActionState({
|
||||
extraQueryExclusions: [],
|
||||
overlayDatabaseMode: "none" /* None */,
|
||||
useOverlayDatabaseCaching: false,
|
||||
overlayModeSetExplicitly: false,
|
||||
repositoryProperties,
|
||||
enableFileCoverageInformation
|
||||
};
|
||||
@@ -151823,6 +151840,7 @@ async function checkOverlayEnablement(codeql, features, languages, sourceRoot, b
|
||||
return validateOverlayDatabaseMode(
|
||||
modeEnv,
|
||||
false,
|
||||
true,
|
||||
codeql,
|
||||
languages,
|
||||
sourceRoot,
|
||||
@@ -151897,6 +151915,7 @@ async function checkOverlayEnablement(codeql, features, languages, sourceRoot, b
|
||||
return validateOverlayDatabaseMode(
|
||||
overlayDatabaseMode,
|
||||
true,
|
||||
false,
|
||||
codeql,
|
||||
languages,
|
||||
sourceRoot,
|
||||
@@ -151905,7 +151924,7 @@ async function checkOverlayEnablement(codeql, features, languages, sourceRoot, b
|
||||
logger
|
||||
);
|
||||
}
|
||||
async function validateOverlayDatabaseMode(overlayDatabaseMode, useOverlayDatabaseCaching, codeql, languages, sourceRoot, buildMode, gitVersion, logger) {
|
||||
async function validateOverlayDatabaseMode(overlayDatabaseMode, useOverlayDatabaseCaching, overlayModeSetExplicitly, codeql, languages, sourceRoot, buildMode, gitVersion, logger) {
|
||||
if (buildMode !== "none" /* None */ && (await Promise.all(
|
||||
languages.map(
|
||||
async (l) => l !== "go" /* go */ && // Workaround to allow overlay analysis for Go with any build
|
||||
@@ -151949,7 +151968,8 @@ async function validateOverlayDatabaseMode(overlayDatabaseMode, useOverlayDataba
|
||||
}
|
||||
return new Success({
|
||||
overlayDatabaseMode,
|
||||
useOverlayDatabaseCaching
|
||||
useOverlayDatabaseCaching,
|
||||
overlayModeSetExplicitly
|
||||
});
|
||||
}
|
||||
async function isTrapCachingEnabled(features, overlayDatabaseMode) {
|
||||
@@ -151987,7 +152007,7 @@ function hasQueryCustomisation(userConfig) {
|
||||
return isDefined2(userConfig["disable-default-queries"]) || isDefined2(userConfig.queries) || isDefined2(userConfig["query-filters"]);
|
||||
}
|
||||
async function applyIncrementalAnalysisSettings(config, hasDiffRanges, codeql, logger) {
|
||||
if (config.overlayDatabaseMode === "overlay" /* Overlay */ && !hasDiffRanges) {
|
||||
if (config.overlayDatabaseMode === "overlay" /* Overlay */ && !hasDiffRanges && !config.overlayModeSetExplicitly) {
|
||||
logger.info(
|
||||
`Reverting overlay database mode to ${"none" /* None */} because the PR diff ranges could not be computed.`
|
||||
);
|
||||
@@ -152095,12 +152115,17 @@ async function initConfig(features, inputs) {
|
||||
logger
|
||||
);
|
||||
if (overlayDatabaseModeResult.isSuccess()) {
|
||||
const { overlayDatabaseMode, useOverlayDatabaseCaching } = overlayDatabaseModeResult.value;
|
||||
const {
|
||||
overlayDatabaseMode,
|
||||
useOverlayDatabaseCaching,
|
||||
overlayModeSetExplicitly
|
||||
} = overlayDatabaseModeResult.value;
|
||||
logger.info(
|
||||
`Using overlay database mode: ${overlayDatabaseMode} ${useOverlayDatabaseCaching ? "with" : "without"} caching.`
|
||||
);
|
||||
config.overlayDatabaseMode = overlayDatabaseMode;
|
||||
config.useOverlayDatabaseCaching = useOverlayDatabaseCaching;
|
||||
config.overlayModeSetExplicitly = overlayModeSetExplicitly;
|
||||
} else {
|
||||
const overlayDisabledReason = overlayDatabaseModeResult.value;
|
||||
logger.info(
|
||||
|
||||
Reference in New Issue
Block a user