Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance package version updates. #7304

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

michaelgsharp
Copy link
Member

Updates to new stable maintenance package versions.

@michaelgsharp
Copy link
Member Author

Merging on red since the only test failures are known test failures and we don't have the repo set up correctly for Build Analysis to be able to bypass it.

@michaelgsharp michaelgsharp merged commit 442d51c into dotnet:main Nov 13, 2024
19 of 25 checks passed
@michaelgsharp michaelgsharp deleted the mp-updates branch November 13, 2024 00:39
@michaelgsharp
Copy link
Member Author

/backport to release/4.0

Copy link

Started backporting to release/4.0: https://github.com/dotnet/machinelearning/actions/runs/11808307602

Copy link

@michaelgsharp backporting to release/4.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: mp updates
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 mp updates
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link

@michaelgsharp an error occurred while backporting to release/4.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

Copy link

codecov bot commented Nov 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.87%. Comparing base (4a6ce50) to head (2b11fb2).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7304      +/-   ##
==========================================
- Coverage   68.88%   68.87%   -0.01%     
==========================================
  Files        1470     1470              
  Lines      274005   274005              
  Branches    28403    28403              
==========================================
- Hits       188747   188723      -24     
- Misses      77942    77961      +19     
- Partials     7316     7321       +5     
Flag Coverage Δ
Debug 68.87% <ø> (-0.01%) ⬇️
production 63.28% <ø> (-0.02%) ⬇️
test 89.40% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 6 files with indirect coverage changes

michaelgsharp added a commit that referenced this pull request Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants