Skip to content

Merge main into releases/v3 #2997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jul 29, 2025
Merged

Merge main into releases/v3 #2997

merged 22 commits into from
Jul 29, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jul 29, 2025

Merging 80a09d7 into releases/v3.

Conductor for this PR is @cklin.

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/v3 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.

github-actions bot and others added 22 commits July 15, 2025 00:18
Mergeback v3.29.4 refs/heads/releases/v3 into main
Bumps the npm group with 2 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [nock](https://github.com/nock/nock).


Updates `@eslint/js` from 9.31.0 to 9.32.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.32.0/packages/js)

Updates `nock` from 14.0.6 to 14.0.7
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](nock/nock@v14.0.6...v14.0.7)

---
updated-dependencies:
- dependency-name: "@eslint/js"
  dependency-version: 9.32.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: nock
  dependency-version: 14.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
...

Signed-off-by: dependabot[bot] <support@github.com>
…er-versions

Update supported GitHub Enterprise Server versions
…b9fad0

Bump the npm group with 2 updates
@cklin cklin marked this pull request as ready for review July 29, 2025 20:42
@Copilot Copilot AI review requested due to automatic review settings July 29, 2025 20:42
@cklin cklin requested a review from a team as a code owner July 29, 2025 20:42
Copy link
Contributor

@Copilot 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

This PR merges main into the releases/v3 branch, updating the CodeQL Action to version 3.29.5 with CodeQL bundle version 2.22.2. The changes include version bumps, API compatibility updates, deprecation timeline adjustments, and test matrix modifications to support newer CodeQL versions while dropping support for older ones.

Key changes:

  • Update default CodeQL bundle and CLI versions from 2.22.1 to 2.22.2
  • Bump minimum supported GHES version from 3.13 to 3.14 and update deprecation timelines
  • Add support for CodeQL 2.21.4 in test matrices while removing 2.16.6

Reviewed Changes

Copilot reviewed 14 out of 20 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/defaults.json Updates default CodeQL bundle and CLI versions to 2.22.2
src/codeql.ts Updates minimum version requirements and GHES deprecation dates
src/api-compatibility.json Bumps minimum supported GHES version from 3.13 to 3.14
pr-checks/sync.py Adds CodeQL 2.21.4 to test matrix and removes 2.16.6
package.json Version bump to 3.29.5 and dependency updates
lib/* Generated JavaScript files reflecting TypeScript changes
README.md Updates compatibility matrix with new GHES version requirements
CHANGELOG.md Adds release notes for version 3.29.5 and 3.28.21
.github/workflows/*.yml Updates test matrices to use CodeQL 2.21.4 instead of 2.16.6

@cklin cklin merged commit 51f7732 into releases/v3 Jul 29, 2025
278 checks passed
@cklin cklin deleted the update-v3.29.5-80a09d7b0 branch July 29, 2025 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants