Merge releases/v4 into releases/v3#4029
Merged
Merged
Conversation
Mergeback v4.37.1 refs/heads/releases/v4 into main
This makes that function testable.
…auth Use private registry proxy for API requests when available
…-available Always make `docker_registry` registries available
…dresses-ff Promote `NewRemoteFileAddresses` FF
Bumps [tar](https://github.com/isaacs/node-tar) from 7.5.16 to 7.5.20. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v7.5.16...v7.5.20) --- updated-dependencies: - dependency-name: tar dependency-version: 7.5.20 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Convert `update-release-branch.py` to TypeScript
Bump tar from 7.5.16 to 7.5.20
Merge main into releases/v4
This reverts commit 3fa858a.
This reverts commit 1138fef.
….2-e0647621c # Conflicts: # lib/entry-points.js
mbg
approved these changes
Jul 21, 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 e064762 into
releases/v3.Conductor for this PR is @mbg.
Contains the following pull requests:
update-release-branch.pyto TypeScript #4010 (@mbg)NewRemoteFileAddressesFF #4023 (@mbg)docker_registryregistries available #4024 (@mbg)Please do the following:
package.jsonfile contains the correct version.lib/entry-points.jsnpm run build) and push any changes to the built output inlibas a separate commit named exactlyRebuild.releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.