Merge main into releases/v3 #3052
Merged
+343
−324
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 v3.29.10 refs/heads/releases/v3 into main
Bumps the npm group with 3 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [nock](https://github.com/nock/nock). Updates `@typescript-eslint/eslint-plugin` from 8.39.1 to 8.40.0 - [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.40.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.39.1 to 8.40.0 - [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.40.0/packages/parser) Updates `nock` from 14.0.9 to 14.0.10 - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](nock/nock@v14.0.9...v14.0.10) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.40.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-version: 8.40.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: nock dependency-version: 14.0.10 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the actions group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.254.0 to 1.255.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@2a7b300...829114f) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.255.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: henrymercer <14129055+henrymercer@users.noreply.github.com>
…d19-a527837da980 Update ruby/setup-ruby version to v1.255.0 in pr-checks template
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…s-332f575eae Bump ruby/setup-ruby from 1.254.0 to 1.255.0 in the actions group
…71dd16 Bump the npm group with 3 updates
…ig-error Make "init not called" a configuration error
…er-versions Update supported GitHub Enterprise Server versions
Update default bundle to 2.22.4
smowton
approved these changes
Aug 21, 2025
There was a problem hiding this comment.
Pull Request Overview
This is a release-PR merging main into releases/v3 for version 3.29.11, which includes CodeQL bundle version updates and error handling improvements.
- Updates default CodeQL bundle from v2.22.3 to v2.22.4
- Improves error handling by using
ConfigurationErrorinstead of genericErrorfor configuration issues - Updates GitHub API compatibility to support version 3.19
Reviewed Changes
Copilot reviewed 14 out of 51 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| CHANGELOG.md | Adds release notes for version 3.29.11 |
| package.json | Updates version number and dependency versions |
| src/defaults.json | Updates CodeQL bundle and CLI versions |
| src/api-compatibility.json | Updates maximum GitHub API version to 3.19 |
| src/*.ts | Replaces generic Error with ConfigurationError for config issues |
| lib/*.js | Generated JavaScript reflecting the TypeScript changes |
| pr-checks/checks/rubocop-multi-language.yml | Updates ruby/setup-ruby action version |
| .github/workflows/*.yml | Generated workflow file reflecting template changes |
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 14148a4 into
releases/v3.Conductor for this PR is @smowton.
Contains the following pull requests:
Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.