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
Don't explicitly copy to the build server #12747
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM but @emaf is the expert here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you find this helped performance any?
Not really as we only manually copied if it changed, and now without, it also does the same. |
Surely that task took some number of ms? |
/backport to net7.0 |
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/4016794809 |
@PureWeen backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Don't explicitly copy to the build server
Using index info to reconstruct a base tree...
M .nuspec/Microsoft.Maui.Resizetizer.targets
Falling back to patching base and 3-way merge...
Auto-merging .nuspec/Microsoft.Maui.Resizetizer.targets
CONFLICT (content): Merge conflict in .nuspec/Microsoft.Maui.Resizetizer.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Don't explicitly copy to the build server
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@PureWeen an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Description of Change
We no longer have a need to explicitly copy files to the build server as items referenced are now copied automatically: