github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-04-26 16:58:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dependabot/npm_and_yarn/npm-minor-38a2a793c5

Browse Source
This commit is contained in:
Henry Mercer
2025-12-15 14:12:45 +00:00
committed by GitHub
parent b73d396b48 4b675e451b
commit 2ac846d41e
20 changed files with 334 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/analyze-action-post.js
Generated
+18 -1
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -120734,6 +120734,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/analyze-action.js
Generated
+40 -5
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -88211,8 +88211,8 @@ var path4 = __toESM(require("path"));
var semver4 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs3 = __toESM(require("fs"));
@@ -88512,7 +88512,7 @@ function computeChangedFiles(baseFileOids, overlayFileOids) {
var CACHE_VERSION = 1;
var CACHE_PREFIX = "codeql-overlay-base-database";
var MAX_CACHE_OPERATION_MS = 6e5;
function checkOverlayBaseDatabase(config, logger, warningPrefix) {
async function checkOverlayBaseDatabase(codeql, config, logger, warningPrefix) {
const baseDatabaseOidsFilePath = getBaseDatabaseOidsFilePath(config);
if (!fs3.existsSync(baseDatabaseOidsFilePath)) {
logger.warning(
@@ -88520,6 +88520,23 @@ function checkOverlayBaseDatabase(config, logger, warningPrefix) {
);
return false;
}
for (const language of config.languages) {
const dbPath = getCodeQLDatabasePath(config, language);
try {
const resolveDatabaseOutput = await codeql.resolveDatabase(dbPath);
if (resolveDatabaseOutput === void 0 || !("overlayBaseSpecifier" in resolveDatabaseOutput)) {
logger.info(`${warningPrefix}: no overlayBaseSpecifier defined`);
return false;
} else {
logger.debug(
`Overlay base specifier for ${language} overlay-base database found: ${resolveDatabaseOutput.overlayBaseSpecifier}`
);
}
} catch (e) {
logger.warning(`${warningPrefix}: failed to resolve database: ${e}`);
return false;
}
}
return true;
}
async function cleanupAndUploadOverlayBaseDatabaseToCache(codeql, config, logger) {
@@ -88542,7 +88559,8 @@ async function cleanupAndUploadOverlayBaseDatabaseToCache(codeql, config, logger
);
return false;
}
const databaseIsValid = checkOverlayBaseDatabase(
const databaseIsValid = await checkOverlayBaseDatabase(
codeql,
config,
logger,
"Abort uploading overlay-base database to cache"
@@ -90887,6 +90905,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/autobuild-action.js
Generated
+20 -3
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -83701,8 +83701,8 @@ var path3 = __toESM(require("path"));
var semver4 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs2 = __toESM(require("fs"));
@@ -84973,6 +84973,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/defaults.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.23.7",
"cliVersion": "2.23.7",
"priorBundleVersion": "codeql-bundle-v2.23.6",
"priorCliVersion": "2.23.6"
"bundleVersion": "codeql-bundle-v2.23.8",
"cliVersion": "2.23.8",
"priorBundleVersion": "codeql-bundle-v2.23.7",
"priorCliVersion": "2.23.7"
}
lib/init-action-post.js
Generated
+20 -3
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -123083,8 +123083,8 @@ var path4 = __toESM(require("path"));
var semver4 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs3 = __toESM(require("fs"));
@@ -125349,6 +125349,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/init-action.js
Generated
+40 -5
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -85635,8 +85635,8 @@ var path5 = __toESM(require("path"));
var semver4 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs3 = __toESM(require("fs"));
@@ -85914,7 +85914,7 @@ function computeChangedFiles(baseFileOids, overlayFileOids) {
var CACHE_VERSION = 1;
var CACHE_PREFIX = "codeql-overlay-base-database";
var MAX_CACHE_OPERATION_MS = 6e5;
function checkOverlayBaseDatabase(config, logger, warningPrefix) {
async function checkOverlayBaseDatabase(codeql, config, logger, warningPrefix) {
const baseDatabaseOidsFilePath = getBaseDatabaseOidsFilePath(config);
if (!fs3.existsSync(baseDatabaseOidsFilePath)) {
logger.warning(
@@ -85922,6 +85922,23 @@ function checkOverlayBaseDatabase(config, logger, warningPrefix) {
);
return false;
}
for (const language of config.languages) {
const dbPath = getCodeQLDatabasePath(config, language);
try {
const resolveDatabaseOutput = await codeql.resolveDatabase(dbPath);
if (resolveDatabaseOutput === void 0 || !("overlayBaseSpecifier" in resolveDatabaseOutput)) {
logger.info(`${warningPrefix}: no overlayBaseSpecifier defined`);
return false;
} else {
logger.debug(
`Overlay base specifier for ${language} overlay-base database found: ${resolveDatabaseOutput.overlayBaseSpecifier}`
);
}
} catch (e) {
logger.warning(`${warningPrefix}: failed to resolve database: ${e}`);
return false;
}
}
return true;
}
async function downloadOverlayBaseDatabaseFromCache(codeql, config, logger) {
@@ -86009,7 +86026,8 @@ async function downloadOverlayBaseDatabaseFromCache(codeql, config, logger) {
);
return void 0;
}
const databaseIsValid = checkOverlayBaseDatabase(
const databaseIsValid = await checkOverlayBaseDatabase(
codeql,
config,
logger,
"Downloaded overlay-base database is invalid"
@@ -89147,6 +89165,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/resolve-environment-action.js
Generated
+18 -1
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -84672,6 +84672,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/setup-codeql-action.js
Generated
+20 -3
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -83589,8 +83589,8 @@ var path4 = __toESM(require("path"));
var semver3 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs3 = __toESM(require("fs"));
@@ -85975,6 +85975,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/start-proxy-action-post.js
Generated
+1 -1
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
lib/start-proxy-action.js
Generated
+3 -3
View File
@@ -47322,7 +47322,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -99721,8 +99721,8 @@ function getActionsLogger() {
var core7 = __toESM(require_core());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/languages.ts
var KnownLanguage = /* @__PURE__ */ ((KnownLanguage2) => {
lib/upload-lib.js
Generated
+20 -3
View File
@@ -28924,7 +28924,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -86724,8 +86724,8 @@ var path4 = __toESM(require("path"));
var semver4 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs3 = __toESM(require("fs"));
@@ -88697,6 +88697,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {
lib/upload-sarif-action-post.js
Generated
+1 -1
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
lib/upload-sarif-action.js
Generated
+20 -3
View File
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
"package.json"(exports2, module2) {
module2.exports = {
name: "codeql",
version: "4.31.8",
version: "4.31.9",
private: true,
description: "CodeQL action",
scripts: {
@@ -86505,8 +86505,8 @@ var path4 = __toESM(require("path"));
var semver3 = __toESM(require_semver2());
// src/defaults.json
var bundleVersion = "codeql-bundle-v2.23.7";
var cliVersion = "2.23.7";
var bundleVersion = "codeql-bundle-v2.23.8";
var cliVersion = "2.23.8";
// src/overlay-database-utils.ts
var fs3 = __toESM(require("fs"));
@@ -89215,6 +89215,23 @@ ${output}`
);
}
},
async resolveDatabase(databasePath) {
const codeqlArgs = [
"resolve",
"database",
databasePath,
"--format=json",
...getExtraOptionsFromEnv(["resolve", "database"])
];
const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
try {
return JSON.parse(output);
} catch (e) {
throw new Error(
`Unexpected output from codeql resolve database --format=json: ${e}`
);
}
},
async mergeResults(sarifFiles, outputFile, {
mergeRunsFromEqualCategory = false
}) {