mirror of
https://github.com/github/codeql-action.git
synced 2026-10-03 17:41:28 +00:00
Merge remote-tracking branch 'origin/main' into henrymercer/toolcache-bundle-cleanup
Co-authored-by: henrymercer <14129055+henrymercer@users.noreply.github.com>
This commit is contained in:
46
lib/entry-points.js
generated
46
lib/entry-points.js
generated
@@ -23510,18 +23510,18 @@ var init_dist_src2 = __esm({
|
||||
}
|
||||
});
|
||||
|
||||
// node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/version.js
|
||||
// node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/version.js
|
||||
var VERSION5;
|
||||
var init_version2 = __esm({
|
||||
"node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/version.js"() {
|
||||
"node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/version.js"() {
|
||||
VERSION5 = "17.0.0";
|
||||
}
|
||||
});
|
||||
|
||||
// node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/generated/endpoints.js
|
||||
// node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/generated/endpoints.js
|
||||
var Endpoints, endpoints_default;
|
||||
var init_endpoints = __esm({
|
||||
"node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/generated/endpoints.js"() {
|
||||
"node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/generated/endpoints.js"() {
|
||||
Endpoints = {
|
||||
actions: {
|
||||
addCustomLabelsToSelfHostedRunnerForOrg: [
|
||||
@@ -25815,7 +25815,7 @@ var init_endpoints = __esm({
|
||||
}
|
||||
});
|
||||
|
||||
// node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/endpoints-to-methods.js
|
||||
// node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/endpoints-to-methods.js
|
||||
function endpointsToMethods(octokit) {
|
||||
const newMethods = {};
|
||||
for (const scope of endpointMethodsMap.keys()) {
|
||||
@@ -25866,7 +25866,7 @@ function decorate(octokit, scope, methodName, defaults3, decorations) {
|
||||
}
|
||||
var endpointMethodsMap, handler;
|
||||
var init_endpoints_to_methods = __esm({
|
||||
"node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/endpoints-to-methods.js"() {
|
||||
"node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/endpoints-to-methods.js"() {
|
||||
init_endpoints();
|
||||
endpointMethodsMap = /* @__PURE__ */ new Map();
|
||||
for (const [scope, endpoints] of Object.entries(endpoints_default)) {
|
||||
@@ -25944,7 +25944,7 @@ var init_endpoints_to_methods = __esm({
|
||||
}
|
||||
});
|
||||
|
||||
// node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/index.js
|
||||
// node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/index.js
|
||||
var dist_src_exports2 = {};
|
||||
__export(dist_src_exports2, {
|
||||
legacyRestEndpointMethods: () => legacyRestEndpointMethods,
|
||||
@@ -25964,7 +25964,7 @@ function legacyRestEndpointMethods(octokit) {
|
||||
};
|
||||
}
|
||||
var init_dist_src3 = __esm({
|
||||
"node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/index.js"() {
|
||||
"node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/index.js"() {
|
||||
init_version2();
|
||||
init_endpoints_to_methods();
|
||||
restEndpointMethods.VERSION = VERSION5;
|
||||
@@ -162582,8 +162582,8 @@ async function tryUploadSarifIfRunFailed(config, repositoryNwo, features, logger
|
||||
return createFailedUploadFailedSarifResult(e);
|
||||
}
|
||||
}
|
||||
async function uploadFailureInfo(uploadAllAvailableDebugArtifacts, printDebugLogs2, codeql, config, repositoryNwo, features, logger) {
|
||||
await recordOverlayStatus(codeql, config, features, logger);
|
||||
async function uploadFailureInfo(uploadAllAvailableDebugArtifacts, printDebugLogs2, codeql, config, repositoryNwo, features, jobStatus, env, logger) {
|
||||
await recordOverlayStatus(codeql, config, features, jobStatus, env, logger);
|
||||
const uploadFailedSarifResult = await tryUploadSarifIfRunFailed(
|
||||
config,
|
||||
repositoryNwo,
|
||||
@@ -162645,8 +162645,27 @@ async function uploadFailureInfo(uploadAllAvailableDebugArtifacts, printDebugLog
|
||||
}
|
||||
return uploadFailedSarifResult;
|
||||
}
|
||||
async function recordOverlayStatus(codeql, config, features, logger) {
|
||||
if (config.overlayDatabaseMode !== "overlay-base" /* OverlayBase */ || process.env["CODEQL_ACTION_ANALYZE_DID_COMPLETE_SUCCESSFULLY" /* ANALYZE_DID_COMPLETE_SUCCESSFULLY */] === "true" || !await features.getValue("overlay_analysis_status_save" /* OverlayAnalysisStatusSave */)) {
|
||||
function didCodeQlReportError(env) {
|
||||
const jobStatus = env.getOptional("CODEQL_ACTION_JOB_STATUS" /* JOB_STATUS */);
|
||||
return jobStatus === "JOB_STATUS_FAILURE" /* FailureStatus */ || jobStatus === "JOB_STATUS_CONFIGURATION_ERROR" /* ConfigErrorStatus */;
|
||||
}
|
||||
function isConclusiveJobStatus(jobStatus) {
|
||||
switch (jobStatus?.trim().toLowerCase()) {
|
||||
case "failure":
|
||||
case "success":
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
async function recordOverlayStatus(codeql, config, features, jobStatus, env, logger) {
|
||||
if (config.overlayDatabaseMode !== "overlay-base" /* OverlayBase */ || env.getOptional("CODEQL_ACTION_ANALYZE_DID_COMPLETE_SUCCESSFULLY" /* ANALYZE_DID_COMPLETE_SUCCESSFULLY */) === "true" || !await features.getValue("overlay_analysis_status_save" /* OverlayAnalysisStatusSave */)) {
|
||||
return;
|
||||
}
|
||||
if (!isConclusiveJobStatus(jobStatus) && !didCodeQlReportError(env)) {
|
||||
logger.info(
|
||||
`Not recording an improved incremental analysis failure for this job because the job status (${jobStatus ?? "unset"}) does not tell us whether the analysis itself failed.`
|
||||
);
|
||||
return;
|
||||
}
|
||||
const checkRunIdInput = getOptionalInput("check-run-id");
|
||||
@@ -162750,6 +162769,7 @@ async function run4(startedAt) {
|
||||
let uploadFailedSarifResult;
|
||||
let dependencyCachingUsage;
|
||||
try {
|
||||
const jobStatus2 = getOptionalInput("job-status");
|
||||
restoreInputs();
|
||||
const gitHubVersion = await getGitHubVersion();
|
||||
checkGitHubVersionInRange(gitHubVersion, logger);
|
||||
@@ -162774,6 +162794,8 @@ async function run4(startedAt) {
|
||||
config,
|
||||
repositoryNwo,
|
||||
features,
|
||||
jobStatus2,
|
||||
getEnv(),
|
||||
logger
|
||||
);
|
||||
if (await isAnalyzingDefaultBranch() && config.dependencyCachingEnabled !== "none" /* None */) {
|
||||
|
||||
Reference in New Issue
Block a user