Merge releases/v4 into releases/v3#3346
Merged
henrymercer merged 19 commits intoreleases/v3from Dec 9, 2025
Merged
Conversation
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] <support@github.com>
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
Merge main into releases/v4
This reverts commit dbf6819.
This reverts commit 89cb79a.
oscarsj
added
Rebuild
Contributor
Author
|
Pushed a commit to rebuild the Action. Please mark the PR as ready for review to trigger PR checks. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges changes from releases/v4 into releases/v3, updating the action to version 3.31.7 with a new default CodeQL bundle version 2.23.7. However, there are critical version inconsistencies that need to be addressed.
Key changes:
- Version bump from 3.31.6 to 3.31.7
- Update default CodeQL bundle from v2.23.6 to v2.23.7
- Dependency update: @eslint/eslintrc from ^3.3.1 to ^3.3.3
- Workflow improvement to handle PR overlay analysis config separately
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 3.31.7 with CodeQL bundle update |
| package.json | Updates version to 3.31.7 and eslintrc dependency |
| package-lock.json | Contains version mismatch - shows 4.31.7 instead of 3.31.7 |
| src/defaults.json | Updates CodeQL bundle and CLI versions to 2.23.7 |
| lib/*.js | Generated files reflecting package.json and defaults.json changes (not reviewed per guidelines) |
| lib/defaults.json | Generated file mirroring src/defaults.json changes |
| .github/workflows/codescanning-config-cli.yml | Adds separate test cases for PR vs non-PR events to handle overlay analysis |
redsun82
approved these changes
Dec 9, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 cf1bb45 into
releases/v3.Conductor for this PR is @oscarsj.
Contains the following pull requests:
Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.