fix: update main to release branch patches #4017
Merged
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
Signed-off-by: Filinto Duran <1373693+filintod@users.noreply.github.com> Signed-off-by: Samantha Coyle <sam@diagrid.io>
Signed-off-by: Samantha Coyle <sam@diagrid.io> Signed-off-by: joshvanl <me@joshvanl.dev> Co-authored-by: joshvanl <me@joshvanl.dev> Signed-off-by: Samantha Coyle <sam@diagrid.io>
Signed-off-by: MyMirelHub <15373565+MyMirelHub@users.noreply.github.com> Signed-off-by: Samantha Coyle <sam@diagrid.io>
Signed-off-by: Mike Nguyen <hey@mike.ee> Signed-off-by: Samantha Coyle <sam@diagrid.io>
…dapr#4006) Signed-off-by: Filinto Duran <1373693+filintod@users.noreply.github.com> Signed-off-by: Samantha Coyle <sam@diagrid.io>
|
working on dco pls give me a sec 🙏 |
sicoyle
force-pushed
the
update-main-to-release-branch
branch
from
bfa6d92 to
be80fe5
Compare
|
did a to make dco build step happy and append my sign-off everywhere |
JoshVanL
approved these changes
Sep 9, 2025
JoshVanL
approved these changes
Sep 9, 2025
mikeee
approved these changes
Sep 9, 2025
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Description
TLDR this PR fixes the first part of the commit history corruption going on in contrib. I need a follow up PR in the release branch after this gets merged.
Context:
We have the release-1.16 branch and main. Every PR update grabbing latest from main to the release branch reverted any PR that had only been opened to the release branch. From what I see, at no point did we have a PR from release-1.16 -> main. What this means is that all of the 1.16 release branch specific fixes got reverted on every merge that we did to update the release branch with the latest from main. This PR brings all of the PRs opened / commits only to the release branch back to main.
PRs to release branch ONLY that I am cherry-picking in this PR back into main (with context on how I did it):
TODO: PRs updating release branch to what is sitting in main that I still need to cross check all of the changes are correct and more things are not missing:
Since main is missing PRs, then commits/PRs missing in main must be added first, and then we can have an official PR from main to update release-1.16:
Note: there were attempted fixes which is super helpful, but they were missing the full story / all changes to correct this situation
To prevent this in future, one option we could do is to to have a PR open during the release back to main, so that way we capture if a PR is only merged into release branch, then it will for sure be captured back in main.
Issue reference
We strive to have all PR being opened based on an issue, where the problem or feature have been discussed prior to implementation.
Please reference the issue this PR will close: #[issue number]
Checklist
Please make sure you've completed the relevant tasks for this PR, out of the following list:
Note: We expect contributors to open a corresponding documentation PR in the dapr/docs repository. As the implementer, you are the best person to document your work! Implementation PRs will not be merged until the documentation PR is opened and ready for review.