chore: back-merge main into develop after v2.3(Verawood.1) - #668
chore: back-merge main into develop after v2.3(Verawood.1)#668IvanStepanok wants to merge 9 commits into
Conversation
Develop to main v1.4
Develop to main v1.5
Develop to main v1.5.1
Develop to main. Release v2
Develop to main v2.1
Release v2.2 (Ulmo.1)
Release v2.3 (Verawood.1)
|
Thanks for the pull request, @IvanStepanok! This repository is currently maintained by Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review. 🔘 Get product approvalIf you haven't already, check this list to see if your contribution needs to go through the product review process.
🔘 Provide contextTo help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:
🔘 Get a green buildIf one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green. DetailsWhere can I find more information?If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources: When can I expect my changes to be merged?Our goal is to get community contributions seen and reviewed as efficiently as possible. However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:
💡 As a result it may take up to several weeks or months to complete a review and merge your PR. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #668 +/- ##
==============================
==============================
☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Brings
developback in line withmainafter the Verawood release.developis strictly behind — 9 commits, nothing ahead — so this is a clean catch-up with no conflicts.What it carries over
swiftlint.yml,unit_tests.ymlandvalidate-translations.ymlto full commit SHAs. It landed onmainonly, sodevelopstill refers to those actions by tag.v2.3(Verawood.1)release merge commit itself.Why it matters now
mainanddevelophad been drifting since 2026-05-28. #660 touched the same two workflow files that #666 rewrote during the release, and that was resolved once, in the release merge — cleanly, because the two changed different lines. Leavingdevelopbehind means the next release merge would have to resolve the same overlap again, against adevelopthat has moved on further.Verified on
mainafter the release merge: both changes survived — the actions are SHA-pinned andruby/setup-rubywithruby-version: 3.3andxcodes select 26.2are present.