Merge releases/v4 into releases/v3#3992
Merged
Merged
Conversation
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Mergeback v4.36.2 refs/heads/releases/v4 into main
Use local `upload-sarif` Action in PR checks job
Only the betterjson option is now used, so remove the old version.
Clean up `codeql.resolveLanguages`
Fix broken log grouping due to nested log group
Bumps the npm-minor group with 4 updates in the / directory: [js-yaml](https://github.com/nodeca/js-yaml), [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript), [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) and [tsx](https://github.com/privatenumber/tsx). Updates `js-yaml` from 4.1.1 to 4.2.0 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/commits) Updates `eslint-import-resolver-typescript` from 4.4.4 to 4.4.5 - [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases) - [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md) - [Commits](import-js/eslint-import-resolver-typescript@v4.4.4...v4.4.5) Updates `typescript-eslint` from 8.60.0 to 8.60.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.60.1/packages/typescript-eslint) Updates `tsx` from 4.22.3 to 4.22.4 - [Release notes](https://github.com/privatenumber/tsx/releases) - [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs) - [Commits](privatenumber/tsx@v4.22.3...v4.22.4) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 4.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: eslint-import-resolver-typescript dependency-version: 4.4.5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: typescript-eslint dependency-version: 8.60.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: tsx dependency-version: 4.22.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…r-94506b9a28 Bump the npm-minor group across 1 directory with 4 updates
…thub/workflows/actions-minor-149d5843f4 Bump the actions-minor group across 1 directory with 3 updates
…thub/workflows/actions/checkout-7.0.0 Bump actions/checkout from 6.0.3 to 7.0.0 in /.github/workflows
This lets us compare the storage cost of overlay-base and trimmed databases for the same commit.
…ize-telemetry Measure overlay-base database size at the clear cleanup level
…e-prop Add FF for configuration file repository property
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Merge main into releases/v4
This reverts commit ee98575.
This reverts commit 0d313a3.
mbg
force-pushed
the
backport-v3.36.3-54f647b7e
branch
from
2f2ad51 to
6153c15
Compare
mbg
approved these changes
Jul 2, 2026
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
2 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 54f647b into
releases/v3.Conductor for this PR is @henrymercer.
Contains the following pull requests:
StartProxyRemoveUnusedRegistriesbehaviour #3909 (@mbg)update-supported-enterprise-server-versionsscript to TypeScript #3916 (@mbg)upload-sarifAction in PR checks job #3953 (@henrymercer)codeql.resolveLanguages#3954 (@henrymercer)ready_for_reviewtriggers from workflows #3969 (@mbg)globto at least13.0.6#3974 (@mbg)Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.