chore: Accumulated backports to v4-next#23321
Merged
Merged
Conversation
They are currently set at 5.5 hours, which is excessive (last few runs were all under 20 minutes)
Collaborator
Author
|
🤖 Auto-merge enabled after 8 hours of inactivity. This PR will be merged automatically once all checks pass. |
alexghr
added a commit
that referenced
this pull request
May 19, 2026
## Summary Brings the accumulated v4-next fixes onto v4 ahead of the next 4.3.0 stable release. Sibling pattern to #23306 (which merged v4-next into v4 for 4.3.0-rc.1). ### Commits coming in from v4-next - `5b61b2d5d3` chore: Accumulated backports to v4-next (#23386) - `38ae87a965` fix(aztec): use perl -i for portable in-place edit in add_crate.sh (#23335) - `f463d6a3cb` fix(aztec-up): fall back to no timeout when /usr/bin/timeout absent (macOS) (#23310) - `1a40b92d98` chore: Accumulated backports to v4-next (#23321) - `84e5bce90c` chore: reduce compat e2e timeout (#23318)
aminsammara
added a commit
that referenced
this pull request
May 20, 2026
Promote v4.3.0-rc.1 to stable. Single commit prepending a `## [4.3.0]` entry to `CHANGELOG.md`; no other files touched. ## What's in this PR The 4.3.0 changelog entry is a superset of the existing `4.3.0-rc.1` entry plus four lines for the commits added between rc.1 and now: - **Bug Fixes** - `aztec:` use perl -i for portable in-place edit in add_crate.sh (#23335) - `aztec-up:` fall back to no timeout when /usr/bin/timeout absent on macOS (#23310) - `release-image:` stamp stdlib/package.json with release version (#23393) - **Miscellaneous** - reduce compat e2e timeout (#23318) The `## [4.3.0-rc.1]` section is preserved below the new entry for historical continuity. ## Filtered from the changelog Eight commits in `v4.3.0-rc.1..HEAD` are dropped as noise: the two `chore: merge v4-next into v4` merge commits, the pre-PR dupe `75fd494a43` of #23393, the two umbrella `chore: Accumulated backports` PRs (#23386, #23321 — their contents are #23310/#23335/#23318 listed above), the internal `Merge branch 'v4-next' into backport-to-v4-next-staging` commit, and the v4-next manifest bump to 4.4.0 (release machinery, doesn't apply to v4). ## After merging 1. Tag `v4.3.0` on the merge commit and push the tag — that kicks off the release pipeline. 2. The manifest stays at `4.3.0` for the 4.3.X patch cycle; bump only if you're cutting 4.4.0 from this branch. ## Test plan - [ ] CI green - [ ] Visual check that the 4.3.0 section reads correctly in `CHANGELOG.md`
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
3 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.
BEGIN_COMMIT_OVERRIDE
chore: reduce compat e2e timeout (#23318)
END_COMMIT_OVERRIDE