Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Merge main into releases/v4#3940

Merged
henrymercer merged 21 commits into
releases/v4github/codeql-action:releases/v4from
update-v4.36.1-2a1689ed4github/codeql-action:update-v4.36.1-2a1689ed4Copy head branch name to clipboard
Jun 2, 2026
Merged

Merge main into releases/v4#3940
henrymercer merged 21 commits into
releases/v4github/codeql-action:releases/v4from
update-v4.36.1-2a1689ed4github/codeql-action:update-v4.36.1-2a1689ed4Copy head branch name to clipboard

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented Jun 2, 2026

Merging 2a1689e into releases/v4.

Conductor for this PR is @henrymercer.

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.

dependabot Bot and others added 21 commits May 20, 2026 22:05
@dependabot
Bump the npm-minor group across 1 directory with 6 updates
bd77449 
Bumps the npm-minor group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [semver](https://github.com/npm/node-semver) | `7.7.4` | `7.8.0` |
| [@eslint/compat](https://github.com/eslint/rewrite/tree/HEAD/packages/compat) | `2.0.5` | `2.1.0` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `20.19.39` | `20.19.41` |
| [nock](https://github.com/nock/nock) | `14.0.12` | `14.0.15` |
| [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) | `8.59.2` | `8.59.3` |
| [yaml](https://github.com/eemeli/yaml) | `2.8.4` | `2.9.0` |



Updates `semver` from 7.7.4 to 7.8.0
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](npm/node-semver@v7.7.4...v7.8.0)

Updates `@eslint/compat` from 2.0.5 to 2.1.0
- [Release notes](https://github.com/eslint/rewrite/releases)
- [Changelog](https://github.com/eslint/rewrite/blob/main/packages/compat/CHANGELOG.md)
- [Commits](https://github.com/eslint/rewrite/commits/compat-v2.1.0/packages/compat)

Updates `@types/node` from 20.19.39 to 20.19.41
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `nock` from 14.0.12 to 14.0.15
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](nock/nock@v14.0.12...v14.0.15)

Updates `typescript-eslint` from 8.59.2 to 8.59.3
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.59.3/packages/typescript-eslint)

Updates `yaml` from 2.8.4 to 2.9.0
- [Release notes](https://github.com/eemeli/yaml/releases)
- [Commits](eemeli/yaml@v2.8.4...v2.9.0)

---
updated-dependencies:
- dependency-name: semver
  dependency-version: 7.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-minor
- dependency-name: "@eslint/compat"
  dependency-version: 2.1.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor
- dependency-name: "@types/node"
  dependency-version: 20.19.41
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor
- dependency-name: nock
  dependency-version: 14.0.15
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor
- dependency-name: typescript-eslint
  dependency-version: 8.59.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor
- dependency-name: yaml
  dependency-version: 2.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump ruby/setup-ruby
a0a8d16 
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.306.0 to 1.307.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@c4e5b13...6aaa311)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.307.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: actions-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions
Rebuild
89c58e6
@github-actions
Rebuild
14c1509
@github-actions
Update changelog and version after v4.36.0
0cd24d8
@github-actions
Rebuild
80795fb
@oscarsj
Merge pull request #3928 from github/mergeback/v4.36.0-to-main-7211b7c8
0fb8a66 
Mergeback v4.36.0 refs/heads/releases/v4 into main
@mbg
Merge branch 'main' into dependabot/npm_and_yarn/npm-minor-28e225f5ad
8a1e375
@mbg
Merge pull request #3921 from github/dependabot/npm_and_yarn/npm-mino…
0e150e4 
…r-28e225f5ad

Bump the npm-minor group across 1 directory with 6 updates
@github-actions
Update supported GitHub Enterprise Server versions
8b0c522
@dependabot
Bump the npm-minor group across 1 directory with 2 updates
b42b754 
Bumps the npm-minor group with 2 updates in the / directory: [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) and [tsx](https://github.com/privatenumber/tsx).


Updates `typescript-eslint` from 8.59.3 to 8.59.4
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.59.4/packages/typescript-eslint)

Updates `tsx` from 4.21.0 to 4.22.3
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](privatenumber/tsx@v4.21.0...v4.22.3)

---
updated-dependencies:
- dependency-name: typescript-eslint
  dependency-version: 8.59.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor
- dependency-name: tsx
  dependency-version: 4.22.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump tmp from 0.2.4 to 0.2.7
bef1eb7 
Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.4 to 0.2.7.
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](raszi/node-tmp@v0.2.4...v0.2.7)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions
Rebuild
6a37b3a
@mbg
Merge branch 'main' into dependabot/github_actions/dot-github/workflo…
ad170e6 
…ws/actions-minor-da8be134b1
@mbg
Merge pull request #3936 from github/dependabot/npm_and_yarn/tmp-0.2.7
5e6adf7 
Bump tmp from 0.2.4 to 0.2.7
@mbg
Merge pull request #3925 from github/dependabot/github_actions/dot-gi…
cef2e7a 
…thub/workflows/actions-minor-da8be134b1

Bump ruby/setup-ruby from 1.306.0 to 1.307.0 in /.github/workflows in the actions-minor group across 1 directory
@mbg
Merge pull request #3934 from github/dependabot/npm_and_yarn/npm-mino…
115001b 
…r-86fb5ccea6

Bump the npm-minor group across 1 directory with 2 updates
@henrymercer
Merge pull request #3933 from github/update-supported-enterprise-serv…
d1eb120 
…er-versions

Update supported GitHub Enterprise Server versions
@henrymercer
Disable missing diff-ranges fallback when overlay enabled manually
5245323
@henrymercer
Merge pull request #3939 from github/henrymercer/skip-overlay-revert-…
2a1689e 
…when-explicit

Disable missing diff-ranges fallback when overlay enabled manually
@github-actions
Update changelog for v4.36.1
9431011
@henrymercer henrymercer marked this pull request as ready for review June 2, 2026 09:54
Copilot AI review requested due to automatic review settings June 2, 2026 09:54
@henrymercer henrymercer requested a review from a team as a code owner June 2, 2026 09:54
@henrymercer henrymercer enabled auto-merge June 2, 2026 09:54
@github-actions github-actions Bot added the size/M Should be of average difficulty to review label Jun 2, 2026
Copilot AI reviewed Jun 2, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Mergeback PR merging main into releases/v4, bundling release v4.36.1 with dependency bumps, GHES version support update, and a behavior change to overlay database mode handling.

Changes:

  • Release v4.36.1: version bump, changelog entry, regenerated lib/ bundle
  • Dependency bumps (semver, eslint/compat, types/node, nock, typescript-eslint, yaml, tsx, tmp, ruby/setup-ruby) and bumped GHES API compatibility max version to 3.22
  • Behavior: when CODEQL_OVERLAY_DATABASE_MODE is set explicitly, skip the missing-diff-ranges fallback that disables overlay mode (new overlayModeSetExplicitly field threaded through config)
Show a summary per file
File Description
package.json Version bump to 4.36.1; dependency bumps
package-lock.json Lockfile updates for dependency bumps
pr-checks/package.json Bump yaml, @types/node, tsx
CHANGELOG.md Add 4.36.1 release entry
src/api-compatibility.json Bump max supported GHES version to 3.22
src/config-utils.ts Add overlayModeSetExplicitly field and skip fallback when set
src/config-utils.test.ts Tests for new explicit-mode behavior
src/testing-utils.ts Initialize new field in test config
pr-checks/checks/rubocop-multi-language.yml Bump ruby/setup-ruby to v1.307.0
.github/workflows/__rubocop-multi-language.yml Generated workflow update
lib/entry-points.js Regenerated bundle

Copilot's findings

  • Files reviewed: 8/11 changed files
  • Comments generated: 0

@henrymercer henrymercer merged commit 87557b9 into releases/v4 Jun 2, 2026
218 checks passed
@henrymercer henrymercer deleted the update-v4.36.1-2a1689ed4 branch June 2, 2026 10:07
@github-actions github-actions Bot mentioned this pull request Jun 2, 2026
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@henrymercer henrymercer henrymercer approved these changes

Assignees

@henrymercer henrymercer

Labels

size/M Should be of average difficulty to review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@henrymercer @oscarsj @mbg
Morty Proxy This is a proxified and sanitized view of the page, visit original site.