Merge main into releases/v4 #3344
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mergeback v4.31.6 refs/heads/releases/v4 into main
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](eslint/eslintrc@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] <[email protected]>
Update CLI config test to account for overlay db changes on PRs
…r-77d26487b0 Bump @eslint/eslintrc from 3.3.1 to 3.3.3 in the npm-minor group
Update default bundle to 2.23.7
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges changes from main into the releases/v4 branch for the 4.31.7 release. The primary purpose is to update the default CodeQL bundle version to 2.23.7 and update a development dependency.
- Updates default CodeQL bundle version from 2.23.6 to 2.23.7
- Updates
@eslint/eslintrcdevelopment dependency from ^3.3.1 to ^3.3.3 - Adds handling for PR-specific overlay analysis configuration in workflow tests
Reviewed changes
Copilot reviewed 17 out of 18 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| CHANGELOG.md | Adds changelog entry for version 4.31.7 with the correct date and description |
| package.json | Updates version to 4.31.7 and @eslint/eslintrc to ^3.3.3 |
| package-lock.json | Updates lockfile to reflect package.json changes |
| src/defaults.json | Updates CodeQL bundle and CLI versions to 2.23.7 |
| lib/defaults.json | Generated file reflecting src/defaults.json changes |
| lib/*.js | Generated JavaScript files reflecting TypeScript source changes |
| .github/workflows/codescanning-config-cli.yml | Adds conditional test logic to handle PR-specific overlay analysis configurations |
oscarsj
approved these changes
Dec 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging f5c63fa into
releases/v4.Conductor for this PR is @oscarsj.
Contains the following pull requests:
Please do the following:
releases/v4branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.