Skip to content

Conversation

cicoyle
Copy link
Contributor

@cicoyle cicoyle commented Aug 14, 2025

cherrypick in the daprbot commit from the release branch in a new branch to master.

I ran the following based on the create release script:

git cherry-pick --strategy=recursive -X theirs 2925a41286f643727bf5b65bf4aa56da23439617

It failed the same way it did in CI here due to conflicts. Locally I saw:

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: docs/dapr-sdk-workflows/io/dapr/workflows/runtime/WorkflowRuntimeStatus.html
	deleted by them: docs/dapr-sdk-workflows/io/dapr/workflows/runtime/class-use/WorkflowRuntimeStatus.html
	deleted by them: docs/io/dapr/workflows/runtime/WorkflowRuntimeStatus.html
	deleted by them: docs/io/dapr/workflows/runtime/class-use/WorkflowRuntimeStatus.html

So I ran a git rm on those files. Then git cherry-pick --continue and pushed.

Signed-off-by: Dapr Bot <daprweb@microsoft.com>
@cicoyle cicoyle requested review from a team as code owners August 14, 2025 20:17
@dapr-bot dapr-bot merged commit eb7cfcc into dapr:master Aug 14, 2025
9 checks passed
Copy link

codecov bot commented Aug 14, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.69%. Comparing base (d759c53) to head (0d9731a).
⚠️ Report is 193 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #1501      +/-   ##
============================================
+ Coverage     76.91%   78.69%   +1.78%     
- Complexity     1592     1917     +325     
============================================
  Files           145      237      +92     
  Lines          4843     5924    +1081     
  Branches        562      610      +48     
============================================
+ Hits           3725     4662     +937     
- Misses          821      939     +118     
- Partials        297      323      +26     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants