Merge main into releases/v4 #3394

github-actions · 2026-01-12T12:25:59Z

Merging 0fa411e into releases/v4.

Conductor for this PR is @igfoo.

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.

This reduces the likelihood of publishing a tag but not a release.

Bumps the npm-minor group with 3 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@eslint/js` from 9.39.1 to 9.39.2 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/commits/v9.39.2/packages/js) Updates `@typescript-eslint/eslint-plugin` from 8.48.1 to 8.49.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.49.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.48.1 to 8.49.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.49.0/packages/parser) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-version: 9.39.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.49.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: "@typescript-eslint/parser" dependency-version: 8.49.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <[email protected]>

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

Overlay analysis depends on `getFileOidsUnderPath`, which uses `git ls-files --format` option that requires Git 2.38.0+. This change adds a check for the git version before enabling overlay analysis. Co-authored-by: henrymercer <[email protected]>

- Add test for Windows-style git version format - Add comment clarifying regex extracts major.minor.patch - Replace dynamic import with static import for semver Co-authored-by: henrymercer <[email protected]>

…metry - Cache the git version to avoid recomputing on repeated calls - Refactor getGitVersion to getGitVersionOrThrow with detailed errors - Add getGitVersion that logs errors and handles caching - Add makeTelemetryDiagnostic helper to diagnostics.ts - Add logGitVersionTelemetry function to log git version telemetry - Call logGitVersionTelemetry in init-action.ts - Add resetCachedGitVersion for testing - Update tests to work with new function signatures and caching Co-authored-by: henrymercer <[email protected]>

Refactored bundle-download-telemetry and zstd-availability diagnostics in init-action.ts to use the new makeTelemetryDiagnostic helper function. Also added guard for empty languages array in logGitVersionTelemetry. Co-authored-by: henrymercer <[email protected]>

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

Bump @actions/* npm packages to latest versions

…r-b2e0062778 Bump the npm-minor group with 3 updates

Bumps the npm-minor group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 8.50.0 to 8.51.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.51.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.50.0 to 8.51.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.51.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.51.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: "@typescript-eslint/parser" dependency-version: 8.51.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…fety Introduce a type-level check that CodeQL is passed during feature flag lookup if it is needed

Bumps the actions-minor group with 1 update in the /.github/workflows directory: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.275.0 to 1.278.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](ruby/setup-ruby@d354de1...4c24fa5) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.278.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…ions/dot-github/workflows/actions-minor-a0e46cd791

…thub/workflows/actions-minor-a0e46cd791 Bump ruby/setup-ruby from 1.275.0 to 1.278.0 in /.github/workflows in the actions-minor group across 1 directory

…r-59ea988ea1 Bump the npm-minor group with 2 updates

Open mergeback PR last

Overlay: Bump minimum CLI version for overlay

Bumps the npm-minor group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 8.51.0 to 8.52.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.52.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.51.0 to 8.52.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.52.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.52.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: "@typescript-eslint/parser" dependency-version: 8.52.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…r-f1cdf520b2 Bump the npm-minor group with 2 updates

Update default bundle to 2.23.9

henrymercer and others added 30 commits November 13, 2025 17:23

Open mergeback PR last

79e9b8a

This reduces the likelihood of publishing a tag but not a release.

Merge branch 'main' into henrymercer/generate-mergeback-last

6678cee

Merge branch 'main' into henrymercer/generate-mergeback-last

7bb4bfc

Rebuild

e1058e4

Initial plan

a0fc644

Bump @actions/* npm packages to latest versions

db75d46

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

Remove changelog note

7a5748c

Initial plan

aff7998

Address code review feedback

fc2bbb0

- Add test for Windows-style git version format - Add comment clarifying regex extracts major.minor.patch - Replace dynamic import with static import for semver Co-authored-by: henrymercer <[email protected]>

Update changelog and version after v4.31.9

6c6e810

Rebuild

d4d47c0

Merge pull request #3372 from github/mergeback/v4.31.9-to-main-5d4e8d1a

6dba008

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

Merge pull request #3368 from github/copilot/bump-actions-npm-packages

1fe89fe

Bump @actions/* npm packages to latest versions

Add artifact scanner

0c8bfea

Add simple artifact scanner for tests only

5459b98

Use artifact scanner in debug artifacts PR checks

f28848a

Ensure .gz files are extracted too

f2ccf3b

Add regression test for artifact scanner

488c1f1

Slim down test debug artifacts

de17262

Suppress debug logs for artifact scanner test

da77f9f

Merge branch 'main' into dependabot/npm_and_yarn/npm-minor-b2e0062778

241948c

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

b88acb2

…r-b2e0062778 Bump the npm-minor group with 3 updates

Avoid logging each extract call

3b94cfe

Verify using post step

faf6d35

Merge branch 'main' into henrymercer/scan-debug-artifacts

6bc6217

Bump timeout on Windows

3322491

henrymercer and others added 20 commits January 5, 2026 16:22

Merge branch 'main' into henrymercer/codeql-ff-improve-safety

29ee0e0

Rebuild now type error fixed in main

ec1705e

Improve test for throwing when no CodeQL provided

855c088

Rebuild

c327260

Merge pull request #3386 from github/henrymercer/codeql-ff-improve-sa…

db72691

…fety Introduce a type-level check that CodeQL is passed during feature flag lookup if it is needed

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

80dbba1

…ions/dot-github/workflows/actions-minor-a0e46cd791

Rebuild

079ca18

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

fd448f7

…thub/workflows/actions-minor-a0e46cd791 Bump ruby/setup-ruby from 1.275.0 to 1.278.0 in /.github/workflows in the actions-minor group across 1 directory

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

a7fe4ff

…r-59ea988ea1 Bump the npm-minor group with 2 updates

Merge pull request #3287 from github/henrymercer/generate-mergeback-last

41448d9

Open mergeback PR last

Merge pull request #3353 from github/kaspersv/bump-min-cli-v-for-overlay

b2951d2

Overlay: Bump minimum CLI version for overlay

Rebuild

c1f5f1a

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

f6a16be

…r-f1cdf520b2 Bump the npm-minor group with 2 updates

Update default bundle to codeql-bundle-v2.23.9

83e7d00

Add changelog note

c284324

Merge pull request #3393 from github/update-bundle/codeql-bundle-v2.23.9

0fa411e

Update default bundle to 2.23.9

Update changelog for v4.31.10

cfa77c6

github-actions bot assigned igfoo Jan 12, 2026

igfoo marked this pull request as ready for review January 12, 2026 12:30

igfoo requested a review from a team as a code owner January 12, 2026 12:30

Copilot AI review requested due to automatic review settings January 12, 2026 12:30

github-actions bot added the size/XL May be very hard to review label Jan 12, 2026

Copilot started reviewing on behalf of igfoo January 12, 2026 12:31 View session

igfoo approved these changes Jan 12, 2026

View reviewed changes

igfoo merged commit cdefb33 into releases/v4 Jan 12, 2026
241 checks passed

igfoo deleted the update-v4.31.10-0fa411efd branch January 12, 2026 14:32

github-actions bot mentioned this pull request Jan 12, 2026

Merge releases/v4 into releases/v3 #3396

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into releases/v4 #3394

Merge main into releases/v4 #3394

github-actions bot commented Jan 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Merge main into releases/v4 #3394

Merge main into releases/v4 #3394

Conversation

github-actions bot commented Jan 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants