Merge main into releases/v3 #3019
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
Prefer providing CodeQL via dependency injection
Mergeback v3.29.6 refs/heads/releases/v3 into main
…on-workaround Fix auto-detection of extractors that aren't languages
Enable rebuilding PRs with conflicts
There was a problem hiding this comment.
Pull Request Overview
This PR is merging changes from main into the releases/v3 branch, preparing for release version 3.29.8. The PR primarily focuses on refactoring CodeQL test utilities and fixing language autodetection issues.
- Refactored CodeQL test utilities by replacing
setCodeQLwithcreateStubCodeQLand removinggetCachedCodeQL - Fixed language autodetection to exclude unsupported extractors like HTML from being treated as supported languages
- Updated the GitHub Actions rebuild workflow to handle merge conflicts and workflow dispatch events
Reviewed Changes
Copilot reviewed 35 out of 53 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/codeql.ts | Major refactoring of test utilities, replacing setCodeQL with createStubCodeQL and removing getCachedCodeQL |
| src/languages.ts | Added "actions" language to KnownLanguage enum in alphabetical order |
| src/config-utils.ts | Added filtering logic to only include known languages from extractors |
| src/debug-artifacts.ts | Updated function signatures to accept CodeQL instance via dependency injection |
| src/init-action-post-helper.ts | Modified to pass CodeQL instance through function parameters instead of creating it internally |
| src/analyze.ts | Updated runQueries function to accept CodeQL instance as parameter |
| Multiple test files | Updated test files to use new createStubCodeQL function instead of setCodeQL |
| lib/*.js | Generated JavaScript files reflecting the TypeScript changes |
| package.json | Version bump from 3.29.6 to 3.29.8 |
| CHANGELOG.md | Added changelog entries for versions 3.29.7 and 3.29.8 |
| .github/workflows/rebuild.yml | Enhanced workflow to handle workflow_dispatch and merge conflicts better |
henrymercer
approved these changes
Aug 8, 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 679a40d into
releases/v3.Conductor for this PR is @henrymercer.
Contains the following pull requests:
Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.