Skip to content

Merge main into releases/v3 #3026

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 42 commits into from
Aug 12, 2025
Merged

Merge main into releases/v3 #3026

merged 42 commits into from
Aug 12, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 12, 2025

Merging cc722e4 into releases/v3.

Conductor for this PR is @mbg.

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.

marcogario and others added 30 commits April 11, 2025 12:05
Mergeback v3.29.8 refs/heads/releases/v3 into main
This commit inlines runInit(), so that it is easier to repeat the
runDatabaseInitCluster() call when needed.
…oolcache

 Cleanup extract to toolcache feature flag
Also run the `rust` checks on "milestone" CLI releases, to ensure we
remain backward compatible with those versions. This was prompted by
#2960 (review)

Running this on current `main` and then on that PR should improve our
confidence we remain backward compatible.

It also turns out a probable `ruamel.yaml` update was changing a lot of
generated workflows, so I've:
* fixed the `ruamel.yaml` version to the latest in `sync.sh`
* added `yaml.width = 120` in `sync.py` to minimize (but not entirely
  remove) the number of changes
* checked in the workflows whose formatting was changed by the new
  `ruamel.yaml` version
henrymercer and others added 12 commits August 11, 2025 14:23
…ound

Clean-up logic for overriding proxy
And revert back related changes
Overlay: check query packs for compatibility
Bumps the npm group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@actions/cache](https://github.com/actions/toolkit/tree/HEAD/packages/cache) | `4.0.3` | `4.0.5` |
| [@eslint/compat](https://github.com/eslint/rewrite/tree/HEAD/packages/compat) | `1.3.1` | `1.3.2` |
| [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.32.0` | `9.33.0` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.39.0` | `8.39.1` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.39.0` | `8.39.1` |
| [nock](https://github.com/nock/nock) | `14.0.8` | `14.0.9` |


Updates `@actions/cache` from 4.0.3 to 4.0.5
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/cache/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/cache)

Updates `@eslint/compat` from 1.3.1 to 1.3.2
- [Release notes](https://github.com/eslint/rewrite/releases)
- [Changelog](https://github.com/eslint/rewrite/blob/main/packages/compat/CHANGELOG.md)
- [Commits](https://github.com/eslint/rewrite/commits/compat-v1.3.2/packages/compat)

Updates `@eslint/js` from 9.32.0 to 9.33.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.33.0/packages/js)

Updates `@typescript-eslint/eslint-plugin` from 8.39.0 to 8.39.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.39.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.39.0 to 8.39.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.39.1/packages/parser)

Updates `nock` from 14.0.8 to 14.0.9
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](nock/nock@v14.0.8...v14.0.9)

---
updated-dependencies:
- dependency-name: "@actions/cache"
  dependency-version: 4.0.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: "@eslint/compat"
  dependency-version: 1.3.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: "@eslint/js"
  dependency-version: 9.33.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.39.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.39.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: nock
  dependency-version: 14.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
...

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

Bump the npm group with 6 updates
@mbg mbg marked this pull request as ready for review August 12, 2025 10:14
@mbg mbg requested a review from a team as a code owner August 12, 2025 10:14
@Copilot Copilot AI review requested due to automatic review settings August 12, 2025 10:14
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 multiple pull requests from the main branch into the releases/v3 branch, preparing for the 3.29.9 release. The changes focus on improving overlay analysis support, removing deprecated features, and updating dependencies.

  • Improved overlay analysis compatibility checking and fallback mechanisms
  • Removed deprecated feature flags and simplified bundle handling
  • Updated build processes and test configurations

Reviewed Changes

Copilot reviewed 101 out of 164 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
src/util.ts Added utility function for generating query suite paths
src/upload-lib.ts Removed deprecated features parameter from function call
src/testing-utils.ts Added overlay version support to version info mocking
src/setup-codeql.ts Simplified bundle extraction and removed deprecated features
src/overlay-database-utils.ts Updated minimum CodeQL overlay version requirement
src/init.ts Major refactoring to support overlay compatibility checking
src/init-action.ts Enhanced init action with overlay compatibility validation
src/feature-flags.ts Removed deprecated feature flags
src/codeql.ts Updated CodeQL interface and removed deprecated methods
src/analyze.ts Updated to use new utility function for query suite paths
src/analyze-action.ts Improved proxy environment variable handling
package.json Updated version to 3.29.9 and dependency versions

@mbg mbg merged commit df55935 into releases/v3 Aug 12, 2025
279 checks passed
@mbg mbg deleted the update-v3.29.9-cc722e476 branch August 12, 2025 10:30
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.

5 participants