XXX

Mergeback v4.31.0 refs/heads/releases/v4 into main

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
 
+## [UNRELEASED]
+
+No user facing changes.
+
 ## 4.31.0 - 24 Oct 2025
 
 - Bump minimum CodeQL bundle version to 2.17.6. [#3223](https://github.com/github/codeql-action/pull/3223)

lib/analyze-action-post.js

@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/analyze-action.js

@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -95919,6 +95919,7 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths,
 }
 async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProcessingResults) {
   const outputPath = pathInput || getOptionalEnvVar("CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */);
+  logger.info(`Post-processed SARIF output path: ${outputPath}`);
   if (outputPath !== void 0) {
     dumpSarifFile(
       JSON.stringify(postProcessingResults.sarif),
@@ -96175,6 +96176,7 @@ function filterAlertsByDiffRange(logger, sarif) {
 
 // src/upload-sarif.ts
 async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutPath, sarifPath, category, postProcessedOutputPath) {
+  logger.info("XXX at upload-sarif.ts|postProcessAndUploadSarif");
   const sarifGroups = await getGroupedSarifFilePaths(
     logger,
     sarifPath
@@ -96183,6 +96185,9 @@ async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutP
   for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant(
     sarifGroups
   )) {
+    logger.info(
+      `XXX at upload-sarif.ts|postProcessAndUploadSarif loop for analysisKind: ${analysisKind}`
+    );
     const analysisConfig = getAnalysisConfig(analysisKind);
     const postProcessingResults = await postProcessSarifFiles(
       logger,
@@ -96410,7 +96415,7 @@ async function run() {
     if (runStats) {
       const checkoutPath = getRequiredInput("checkout_path");
       const category = getOptionalInput("category");
-      if (await features.getValue("analyze_use_new_upload" /* AnalyzeUseNewUpload */)) {
+      if (Math.random() > -1) {
         uploadResults = await postProcessAndUploadSarif(
           logger,
           features,

lib/autobuild-action.js

@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/init-action-post.js

@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/init-action.js

@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/resolve-environment-action.js

@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/setup-codeql-action.js

@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/start-proxy-action-post.js

@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/start-proxy-action.js

@@ -44996,7 +44996,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/upload-lib.js

@@ -33606,7 +33606,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -92733,6 +92733,7 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths,
 }
 async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProcessingResults) {
   const outputPath = pathInput || getOptionalEnvVar("CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */);
+  logger.info(`Post-processed SARIF output path: ${outputPath}`);
   if (outputPath !== void 0) {
     dumpSarifFile(
       JSON.stringify(postProcessingResults.sarif),

lib/upload-sarif-action-post.js

@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {

lib/upload-sarif-action.js

@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.31.0",
+      version: "4.31.1",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -93389,6 +93389,7 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths,
 }
 async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProcessingResults) {
   const outputPath = pathInput || getOptionalEnvVar("CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */);
+  logger.info(`Post-processed SARIF output path: ${outputPath}`);
   if (outputPath !== void 0) {
     dumpSarifFile(
       JSON.stringify(postProcessingResults.sarif),
@@ -93615,6 +93616,7 @@ function filterAlertsByDiffRange(logger, sarif) {
 
 // src/upload-sarif.ts
 async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutPath, sarifPath, category, postProcessedOutputPath) {
+  logger.info("XXX at upload-sarif.ts|postProcessAndUploadSarif");
   const sarifGroups = await getGroupedSarifFilePaths(
     logger,
     sarifPath
@@ -93623,6 +93625,9 @@ async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutP
   for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant(
     sarifGroups
   )) {
+    logger.info(
+      `XXX at upload-sarif.ts|postProcessAndUploadSarif loop for analysisKind: ${analysisKind}`
+    );
     const analysisConfig = getAnalysisConfig(analysisKind);
     const postProcessingResults = await postProcessSarifFiles(
       logger,

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "4.30.10",
+  "version": "4.31.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "4.30.10",
+      "version": "4.31.1",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^2.3.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "4.31.0",
+  "version": "4.31.1",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

src/analyze-action.ts

@@ -351,7 +351,7 @@ async function run() {
       const checkoutPath = actionsUtil.getRequiredInput("checkout_path");
       const category = actionsUtil.getOptionalInput("category");
 
-      if (await features.getValue(Feature.AnalyzeUseNewUpload)) {
+      if (Math.random() > -1) {
         uploadResults = await postProcessAndUploadSarif(
           logger,
           features,

src/upload-lib.ts

@@ -748,7 +748,7 @@ export async function writePostProcessedFiles(
 ) {
   // If there's an explicit input, use that. Otherwise, use the value from the environment variable.
   const outputPath = pathInput || util.getOptionalEnvVar(EnvVar.SARIF_DUMP_DIR);
-
+  logger.info(`Post-processed SARIF output path: ${outputPath}`);
   // If we have a non-empty output path, write the SARIF file to it.
   if (outputPath !== undefined) {
     dumpSarifFile(

src/upload-sarif.ts

@@ -32,6 +32,7 @@ export async function postProcessAndUploadSarif(
   category?: string,
   postProcessedOutputPath?: string,
 ): Promise<UploadSarifResults> {
+  logger.info("XXX at upload-sarif.ts|postProcessAndUploadSarif");
   const sarifGroups = await upload_lib.getGroupedSarifFilePaths(
     logger,
     sarifPath,
@@ -41,6 +42,10 @@ export async function postProcessAndUploadSarif(
   for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant(
     sarifGroups,
   )) {
+    logger.info(
+      `XXX at upload-sarif.ts|postProcessAndUploadSarif loop for analysisKind: ${analysisKind}`,
+    );
+
     const analysisConfig = analyses.getAnalysisConfig(analysisKind);
     const postProcessingResults = await upload_lib.postProcessSarifFiles(
       logger,