Merge pull request #3345 from github/mergeback/v4.31.7-to-main-cf1bb45a

Mergeback v4.31.7 refs/heads/releases/v4 into main
Rebuild
2025-12-06 07:48:17 +08:00 · 2025-12-05 21:43:41 +01:00 · 2025-12-05 17:21:46 +00:00 · 2025-12-05 17:19:09 +00:00 · 2025-12-05 18:17:21 +01:00 · 2025-12-05 15:18:53 +00:00
18 changed files with 87 additions and 58 deletions
--- a/.github/workflows/codescanning-config-cli.yml
+++ b/.github/workflows/codescanning-config-cli.yml
@@ -70,13 +70,33 @@ jobs:
      with:
        version: ${{ matrix.version }}

-    - name: Empty file
+    # On PRs, overlay analysis may change the config that is passed to the CLI.
+    # Therefore, we have two variants of the following test, one for PRs and one for other events.
+    - name: Empty file (non-PR)
+      if: github.event_name != 'pull_request'
      uses: ./../action/.github/actions/check-codescanning-config
      with:
        expected-config-file-contents: "{}"
        languages: javascript
        tools: ${{ steps.prepare-test.outputs.tools-url }}

+    - name: Empty file (PR)
+      if: github.event_name == 'pull_request'
+      uses: ./../action/.github/actions/check-codescanning-config
+      with:
+        expected-config-file-contents: |
+          {
+            "query-filters": [
+              {
+                "exclude": {
+                  "tags": "exclude-from-incremental"
+                }
+              }
+            ]
+          }
+        languages: javascript
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+
    - name: Packs from input
      if: success() || failure()
      uses: ./../action/.github/actions/check-codescanning-config
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@

 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.7 - 05 Dec 2025
+
+- Update default CodeQL bundle version to 2.23.7. [#3343](https://github.com/github/codeql-action/pull/3343)
+
 ## 4.31.6 - 01 Dec 2025

 No user facing changes.
--- a/lib/analyze-action-post.js
+++ b/lib/analyze-action-post.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -88211,8 +88211,8 @@ var path4 = __toESM(require("path"));
 var semver4 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs3 = __toESM(require("fs"));
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -83701,8 +83701,8 @@ var path3 = __toESM(require("path"));
 var semver4 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs2 = __toESM(require("fs"));
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.23.6",
-  "cliVersion": "2.23.6",
-  "priorBundleVersion": "codeql-bundle-v2.23.5",
-  "priorCliVersion": "2.23.5"
+  "bundleVersion": "codeql-bundle-v2.23.7",
+  "cliVersion": "2.23.7",
+  "priorBundleVersion": "codeql-bundle-v2.23.6",
+  "priorCliVersion": "2.23.6"
 }
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -123084,8 +123084,8 @@ var path4 = __toESM(require("path"));
 var semver4 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs3 = __toESM(require("fs"));
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -85635,8 +85635,8 @@ var path5 = __toESM(require("path"));
 var semver4 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs3 = __toESM(require("fs"));
--- a/lib/resolve-environment-action.js
+++ b/lib/resolve-environment-action.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -83589,8 +83589,8 @@ var path4 = __toESM(require("path"));
 var semver3 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs3 = __toESM(require("fs"));
--- a/lib/start-proxy-action-post.js
+++ b/lib/start-proxy-action-post.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
--- a/lib/start-proxy-action.js
+++ b/lib/start-proxy-action.js
@@ -47321,7 +47321,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -47371,7 +47371,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -99720,8 +99720,8 @@ function getActionsLogger() {
 var core7 = __toESM(require_core());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/languages.ts
 var KnownLanguage = /* @__PURE__ */ ((KnownLanguage2) => {
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -28924,7 +28924,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -28974,7 +28974,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -86724,8 +86724,8 @@ var path4 = __toESM(require("path"));
 var semver4 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs3 = __toESM(require("fs"));
--- a/lib/upload-sarif-action-post.js
+++ b/lib/upload-sarif-action-post.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -27627,7 +27627,7 @@ var require_package = __commonJS({
  "package.json"(exports2, module2) {
    module2.exports = {
      name: "codeql",
-      version: "4.31.6",
+      version: "4.31.8",
      private: true,
      description: "CodeQL action",
      scripts: {
@@ -27677,7 +27677,7 @@ var require_package = __commonJS({
      devDependencies: {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -86505,8 +86505,8 @@ var path4 = __toESM(require("path"));
 var semver3 = __toESM(require_semver2());

 // src/defaults.json
-var bundleVersion = "codeql-bundle-v2.23.6";
-var cliVersion = "2.23.6";
+var bundleVersion = "codeql-bundle-v2.23.7";
+var cliVersion = "2.23.7";

 // src/overlay-database-utils.ts
 var fs3 = __toESM(require("fs"));
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "codeql",
-  "version": "4.31.6",
+  "version": "4.31.8",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "codeql",
-      "version": "4.31.6",
+      "version": "4.31.8",
      "license": "MIT",
      "dependencies": {
        "@actions/artifact": "^4.0.0",
@@ -35,7 +35,7 @@
      "devDependencies": {
        "@ava/typescript": "6.0.0",
        "@eslint/compat": "^2.0.0",
-        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/eslintrc": "^3.3.3",
        "@eslint/js": "^9.39.1",
        "@microsoft/eslint-formatter-sarif": "^3.1.0",
        "@octokit/types": "^16.0.0",
@@ -1449,10 +1449,11 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
+      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
@@ -1460,7 +1461,7 @@
        "globals": "^14.0.0",
        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
        "minimatch": "^3.1.2",
        "strip-json-comments": "^3.1.1"
      },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "codeql",
-  "version": "4.31.6",
+  "version": "4.31.8",
  "private": true,
  "description": "CodeQL action",
  "scripts": {
@@ -50,7 +50,7 @@
  "devDependencies": {
    "@ava/typescript": "6.0.0",
    "@eslint/compat": "^2.0.0",
-    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/eslintrc": "^3.3.3",
    "@eslint/js": "^9.39.1",
    "@microsoft/eslint-formatter-sarif": "^3.1.0",
    "@octokit/types": "^16.0.0",
--- a/src/defaults.json
+++ b/src/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.23.6",
-  "cliVersion": "2.23.6",
-  "priorBundleVersion": "codeql-bundle-v2.23.5",
-  "priorCliVersion": "2.23.5"
+  "bundleVersion": "codeql-bundle-v2.23.7",
+  "cliVersion": "2.23.7",
+  "priorBundleVersion": "codeql-bundle-v2.23.6",
+  "priorCliVersion": "2.23.6"
 }
Author	SHA1	Message	Date
Óscar San José	149d184a51	Merge pull request #3345 from github/mergeback/v4.31.7-to-main-cf1bb45a Mergeback v4.31.7 refs/heads/releases/v4 into main	2025-12-05 21:43:41 +01:00
github-actions[bot]	97c2630b10	Rebuild	2025-12-05 17:21:46 +00:00
github-actions[bot]	b93926dc35	Update changelog and version after v4.31.7	2025-12-05 17:19:09 +00:00
Óscar San José	cf1bb45a27	Merge pull request #3344 from github/update-v4.31.7-f5c63fadd Merge main into releases/v4	2025-12-05 18:17:21 +01:00
github-actions[bot]	f4ebe95061	Update changelog for v4.31.7	2025-12-05 15:18:53 +00:00
Óscar San José	f5c63fadd5	Merge pull request #3343 from github/update-bundle/codeql-bundle-v2.23.7 Update default bundle to 2.23.7	2025-12-05 15:06:47 +01:00
github-actions[bot]	a2c01e776e	Add changelog note	2025-12-05 13:39:53 +00:00
github-actions[bot]	ac34c13834	Update default bundle to codeql-bundle-v2.23.7	2025-12-05 13:39:45 +00:00
Michael B. Gale	267c4672a5	Merge pull request #3339 from github/dependabot/npm_and_yarn/npm-minor-77d26487b0 Bump @eslint/eslintrc from 3.3.1 to 3.3.3 in the npm-minor group	2025-12-03 14:27:03 +00:00
Michael B. Gale	aeabef7b69	Merge branch 'main' into dependabot/npm_and_yarn/npm-minor-77d26487b0	2025-12-03 12:43:12 +00:00
Michael B. Gale	78357d3fc9	Merge pull request #3341 from github/mbg/ci/update-cs-config-cli-tests Update CLI config test to account for overlay db changes on PRs	2025-12-03 12:39:49 +00:00
Michael B. Gale	d61a6fa793	Update CLI config test to account for overlay db changes on PRs	2025-12-03 12:11:11 +00:00
github-actions[bot]	ce27e95f79	Rebuild	2025-12-01 18:32:19 +00:00
dependabot[bot]	43224eb34e	Bump @eslint/eslintrc from 3.3.1 to 3.3.3 in the npm-minor group Bumps the npm-minor group with 1 update: [@eslint/eslintrc](https://github.com/eslint/eslintrc). Updates `@eslint/eslintrc` from 3.3.1 to 3.3.3 - [Release notes](https://github.com/eslint/eslintrc/releases) - [Changelog](https://github.com/eslint/eslintrc/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslintrc/compare/v3.3.1...eslintrc-v3.3.3) --- updated-dependencies: - dependency-name: "@eslint/eslintrc" dependency-version: 3.3.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-12-01 18:30:33 +00:00
Michael B. Gale	f0ac9bfbe3	Merge pull request #3337 from github/mergeback/v4.31.6-to-main-fe4161a2 Mergeback v4.31.6 refs/heads/releases/v4 into main	2025-12-01 10:18:06 +00:00
github-actions[bot]	c1ca379fc0	Rebuild	2025-12-01 09:55:25 +00:00
github-actions[bot]	c3455c55c1	Update changelog and version after v4.31.6	2025-12-01 09:50:22 +00:00