Merge main into releases/v4 #3336

github-actions · 2025-12-01T09:26:58Z

Merging ecec1f8 into releases/v4.

Conductor for this PR is @mbg.

Contains the following pull requests:

Please do the following:

Ensure the CHANGELOG displays the correct version and date.
Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
Check that there are not any unexpected commits being merged into the releases/v4 branch.
Ensure the docs team is aware of any documentation changes that need to be released.
Mark the PR as ready for review to trigger the full set of PR checks.
Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
Merge the mergeback PR that will automatically be created once this PR is merged.
Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.

And also clean it up.

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

Bumps the npm-minor group with 3 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc). Updates `@typescript-eslint/eslint-plugin` from 8.46.4 to 8.48.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.48.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.46.4 to 8.48.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.48.0/packages/parser) Updates `eslint-plugin-jsdoc` from 61.2.1 to 61.4.1 - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc) - [Commits](gajus/eslint-plugin-jsdoc@v61.2.1...v61.4.1) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.48.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: "@typescript-eslint/parser" dependency-version: 8.48.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: eslint-plugin-jsdoc dependency-version: 61.4.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps the actions-minor group with 1 update in the /.github/workflows directory: [actions/create-github-app-token](https://github.com/actions/create-github-app-token). Updates `actions/create-github-app-token` from 2.1.4 to 2.2.0 - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](actions/create-github-app-token@v2.1.4...v2.2.0) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…thub/workflows/actions/checkout-6 Bump actions/checkout from 5 to 6 in /.github/workflows

…thub/workflows/actions-minor-8ee81fe642 Bump actions/create-github-app-token from 2.1.4 to 2.2.0 in /.github/workflows in the actions-minor group across 1 directory

…er-versions Update supported GitHub Enterprise Server versions

Co-authored-by: Copilot <[email protected]>

…rn/npm-minor-45ea8d913b

…r-45ea8d913b Bump the npm-minor group with 3 updates

Remove `push` triggers from workflow collections

C#: Cache temporary dependency directory for BMN

Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.3.2. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.3.2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

…ge-1.3.2 Bump node-forge from 1.3.1 to 1.3.2

Overlay: Fall back to full analysis if memory flag is low

…cks-option Overlay: Add feature flag to skip resource checks

Overlay: Small code improvements

Remove branch filter for PR event in CodeQL workflow

Copilot

Pull request overview

This is a release PR merging changes from main into the releases/v4 branch for version 4.31.6. The PR includes 12 pull requests with various internal improvements and updates.

Key Changes:

Version bump to 4.31.6
Dependency updates (node-forge, TypeScript ESLint packages, eslint-plugin-jsdoc)
Internal refactoring and feature additions (C# caching, overlay analysis improvements, memory limits)
GitHub Actions checkout action updated from v5 to v6

Reviewed changes

Copilot reviewed 103 out of 104 changed files in this pull request and generated 7 comments.

File	Description
CHANGELOG.md	Added entry for version 4.31.6 dated 01 Dec 2025 with "No user facing changes"
package.json	Version updated to 4.31.6 with dependency updates

Note: Per the repository's custom coding guidelines for release PRs, only CHANGELOG.md and package.json were reviewed. All other files are considered to have been previously reviewed in their respective PRs and are excluded from this review.

lib/resolve-environment-action.js

lib/autobuild-action.js

lib/analyze-action.js

lib/setup-codeql-action.js

lib/upload-lib.js

lib/upload-sarif-action.js

lib/start-proxy-action.js

mbg and others added 30 commits November 13, 2025 13:40

Refactor C# cache content paths into a function

cf8b7a6

Pass FeatureEnablement to getDependencyPaths

d854ba6

Add FF for extra C# cache contents

a47d04c

Include getCsharpTempDependencyDir in C# caches if FF is enabled

ecaa6db

Configure temp dependency dir for C# extractor when FF is enabled

f5f9571

And also clean it up.

Update changelog and version after v4.31.5

29e11fd

Rebuild

4783501

Merge pull request #3323 from github/mergeback/v4.31.5-to-main-fdbfb4d2

52f930e

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

Rebuild

5142791

Rebuild

8484f54

Merge pull request #3327 from github/dependabot/github_actions/dot-gi…

62e9052

…thub/workflows/actions/checkout-6 Bump actions/checkout from 5 to 6 in /.github/workflows

Merge pull request #3326 from github/dependabot/github_actions/dot-gi…

0e52774

…thub/workflows/actions-minor-8ee81fe642 Bump actions/create-github-app-token from 2.1.4 to 2.2.0 in /.github/workflows in the actions-minor group across 1 directory

Update supported GitHub Enterprise Server versions

6b7e963

Merge branch 'main' into mbg/csharp/more-cache-locations

0155561

Merge pull request #3328 from github/update-supported-enterprise-serv…

99d80b4

…er-versions Update supported GitHub Enterprise Server versions

Update version in package.json too

d8e497a

Co-authored-by: Copilot <[email protected]>

Merge remote-tracking branch 'origin/main' into dependabot/npm_and_ya…

85fd3e5

…rn/npm-minor-45ea8d913b

Rebuild

510d25f

Remove push triggers from workflow collections

a690945

Merge pull request #3325 from github/dependabot/npm_and_yarn/npm-mino…

c370017

…r-45ea8d913b Bump the npm-minor group with 3 updates

Merge pull request #3330 from github/mbg/ci/remove-push-from-groups

7850b1c

Remove `push` triggers from workflow collections

Merge branch 'main' into mbg/csharp/more-cache-locations

3e93966

Merge pull request #3286 from github/mbg/csharp/more-cache-locations

59ce4c1

C#: Cache temporary dependency directory for BMN

Rebuild

4822f93

Simplify getOverlayDatabaseMode

bd30e75

Overlay: Fall back to full analysis if memory flag is low

bd8d26b

kaspersv and others added 14 commits November 27, 2025 12:30

Overlay: Add feature flag to skip resource checks

1ffb7dd

Merge pull request #3331 from github/dependabot/npm_and_yarn/node-for…

d29b979

…ge-1.3.2 Bump node-forge from 1.3.1 to 1.3.2

Merge pull request #3332 from github/kaspersv/overlay-memory-limit

c178e03

Overlay: Fall back to full analysis if memory flag is low

Overlay: Introduce overlay memory limit constant

2f3bbce

Rename getMemoryFlagValue

8d91fa1

Order feature flags alphabetically

b02fa13

Add comment to runnerSupportsOverlayAnalysis

58c5954

Merge branch 'main' into kaspersv/overlay-no-resource-checks-option

f036b1c

Merge pull request #3333 from github/kaspersv/overlay-no-resource-che…

75b2f49

…cks-option Overlay: Add feature flag to skip resource checks

Merge branch 'main' into kaspersv/overlay-minor-comments

32ada5e

Remove branch filter for PR event in CodeQL workflow

f7abc74

Merge pull request #3334 from github/kaspersv/overlay-minor-comments

23da732

Overlay: Small code improvements

Merge pull request #3335 from github/mbg/ci/run-codeql-on-all-prs

ecec1f8

Remove branch filter for PR event in CodeQL workflow

Update changelog for v4.31.6

88c2ab5

github-actions bot assigned mbg Dec 1, 2025

github-actions bot added the size/L May be hard to review label Dec 1, 2025

mbg marked this pull request as ready for review December 1, 2025 09:30

mbg requested a review from a team as a code owner December 1, 2025 09:30

Copilot AI review requested due to automatic review settings December 1, 2025 09:30

mbg approved these changes Dec 1, 2025

View reviewed changes

Copilot started reviewing on behalf of mbg December 1, 2025 09:31 View session

Copilot finished reviewing on behalf of mbg December 1, 2025 09:32

Copilot AI reviewed Dec 1, 2025

View reviewed changes

mbg enabled auto-merge December 1, 2025 09:45

mbg merged commit fe4161a into releases/v4 Dec 1, 2025
247 checks passed

mbg deleted the update-v4.31.6-ecec1f887 branch December 1, 2025 09:48

github-actions bot mentioned this pull request Dec 1, 2025

Merge releases/v4 into releases/v3 #3338

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into releases/v4 #3336

Merge main into releases/v4 #3336

Uh oh!

github-actions bot commented Dec 1, 2025 •

edited by mbg

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Merge main into releases/v4 #3336

Merge main into releases/v4 #3336

Uh oh!

Conversation

github-actions bot commented Dec 1, 2025 • edited by mbg Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

github-actions bot commented Dec 1, 2025 •

edited by mbg

Loading