Merge main into releases/v3 #2814
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v3.28.11 refs/heads/releases/v3 into main
When a user specifies "cleanup-level: overlay", it suggests that the user wishes to preserve the evaluation cache for future use. So in this case we should not set --expect-discarded-cache when running queries.
Bumps the npm group with 3 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@eslint/js` from 9.21.0 to 9.22.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.22.0/packages/js) Updates `@typescript-eslint/eslint-plugin` from 8.26.0 to 8.26.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.26.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.26.0 to 8.26.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.26.1/packages/parser) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps the actions group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.221.0 to 1.222.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@32110d4...277ba2a) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] <[email protected]>
…0c3752 build(deps-dev): bump the npm group with 3 updates
This commit adds a OverlayDatabaseMode parameter to databaseInitCluster(). The parameter controls the "codeql database init" flags concerning overlay database creation. There is no behavior change in this commit because we always pass OverlayDatabaseMode.None to databaseInitCluster(). That will change in the next commit.
This commit adds support for creating overlay-base and overlay databases, controlled via the CODEQL_OVERLAY_DATABASE_MODE environment variable.
Basic support for overlay databases
…s-96d25c356e build(deps): bump ruby/setup-ruby from 1.221.0 to 1.222.0 in the actions group
Minimally remove micromatch
git-utils: deleted unused functions
I explicitly had to downgrade "@octokit/plugin-retry" to "^6.0.0". Other dependencies were upgraded.
Fix dependabot errors
Bumps the actions group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.222.0 to 1.226.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@277ba2a...922ebc4) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] <[email protected]>
…s-c2c311daa1 build(deps): bump ruby/setup-ruby from 1.222.0 to 1.226.0 in the actions group
…dless Set and cache dependency directory for Java `build-mode: none`
Update default bundle to 2.20.7
smowton
approved these changes
Mar 19, 2025
There was a problem hiding this comment.
Pull Request Overview
Merging main into releases/v3 to integrate new overlay database mode support and dependency caching enhancements.
- Introduces overlay database mode constants and logic in initialization and CodeQL operations.
- Enhances dependency caching for Java build-mode: none and propagates new cleanup-level parameters to query execution.
- Updates test cases and workflow configuration to reflect these changes.
Reviewed Changes
Copilot reviewed 1685 out of 1686 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| lib/overlay-database-utils.js | Adds overlay database mode constants and exports. |
| lib/init-action.js | Integrates overlay database mode logic and logging into initialization. |
| lib/init.js | Exports and implements getOverlayDatabaseMode; updates runInit to pass the overlay mode. |
| lib/analyze.js | Adds dependency caching logic for Java and configures extractor options. |
| lib/git-utils.js | Removes unused Git merge utility functions. |
| lib/analyze-action-post.js | Adds cleanup for temporary Java dependency directory post-action. |
| .github/workflows/__rubocop-multi-language.yml | Updates Ruby setup action version. |
| lib/dependency-caching.js | Exports a function for obtaining the Java temporary dependency directory and adds it to the cache directories. |
| CHANGELOG.md | Documents dependency caching changes and CLI version update. |
| lib/analyze-action.js | Introduces a cleanup-level parameter for query execution and cleanup functions. |
| lib/codeql.js | Propagates overlay database mode to the database initialization and adjusts query flags. |
| lib/analyze.test.js | Provides updated test calls for runQueries with the new cleanup-level parameter. |
| lib/codeql.test.js | Adjusts database initialization tests to include overlay database mode. |
Files not reviewed (1)
- lib/defaults.json: Language not supported
Tip: Copilot only keeps its highest confidence comments to reduce noise and keep you focused. Learn more
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 6349095 into
releases/v3.Conductor for this PR is @smowton.
Contains the following pull requests:
build-mode: none#2802 (@mbg)Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.