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

Update Source-Build SDK Diff Tests Baselines and Exclusions #41131

Merged
merged 8 commits into from
May 28, 2024

Conversation

dotnet-sb-bot
Copy link
Contributor

@dotnet-sb-bot dotnet-sb-bot commented May 23, 2024

This PR was created by the CreateBaselineUpdatePR tool for build 2461402.

The updated test results can be found at https://dev.azure.com/dnceng/internal/_build/results?buildId=2461402 (internal Microsoft link)

@mthalman
Copy link
Member

@ellahathaway - There's something up with the PR generation here. The initial commit looked ok but then there was another that brought in additional files.

@ellahathaway
Copy link
Member

ellahathaway commented May 24, 2024

@ellahathaway - There's something up with the PR generation here. The initial commit looked ok but then there was another that brought in additional files.

The issue was that it was pulling in changes from main, but the PR didn't merge in the latest from main. I'm thinking that I'm going to have to adjust the PR generation tool to merge in the target branch to an open PR before making changes.

@ellahathaway
Copy link
Member

Tested these changes in https://dev.azure.com/dnceng/internal/_build/results?buildId=2460102&view=results (internal Microsoft link) and the tests were green

@ellahathaway
Copy link
Member

Looks like the majority of changes for the artifact sizes are for dotnet-format, dotnet-watch, and movement/relocation of other files. Dotnet-format and dotnet-watch are known to cause noise, and the movement/relocation of files is insignificant in the context of artifact sizes.

The only thing that stood out to me was the increase in size of files in sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.current/x.y.z/*. This can be explained by dotnet/dotnet@5f8e8cb#diff-fed6986c23420a5acd094ab8cb85721066c4f94eabef87c760a488dfb358689b. The changes seem insignificant to me in the context of the artifact sizes.

@ellahathaway
Copy link
Member

I also sanity checked the removal of the SDK diff exclusions in this pipeline run, and everything passed as expected: https://dev.azure.com/dnceng/internal/_build/results?buildId=2460102&view=results

@ellahathaway ellahathaway enabled auto-merge (squash) May 28, 2024 16:00
@ellahathaway ellahathaway merged commit dae3804 into main May 28, 2024
36 checks passed
@ellahathaway ellahathaway deleted the pr-baseline-20240523221118 branch May 28, 2024 17:31
@Winniexu01
Copy link
Member

/backport to release/9.0.1xx-preview5

Copy link
Contributor

github-actions bot commented Jun 4, 2024

Started backporting to release/9.0.1xx-preview5: https://github.com/dotnet/sdk/actions/runs/9362760310

Copy link
Contributor

github-actions bot commented Jun 4, 2024

@Winniexu01 an error occurred while backporting to release/9.0.1xx-preview5, please check the run log for details!

Error: @Winniexu01 is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=Winniexu01

@Winniexu01
Copy link
Member

/backport to release/9.0.1xx-preview5

Copy link
Contributor

github-actions bot commented Jun 4, 2024

Started backporting to release/9.0.1xx-preview5: https://github.com/dotnet/sdk/actions/runs/9362866177

Copy link
Contributor

github-actions bot commented Jun 4, 2024

@Winniexu01 backporting to release/9.0.1xx-preview5 failed, the patch most likely resulted in conflicts:

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

Applying: Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2459343 (internal Microsoft link)
Applying: Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2459709 (internal Microsoft link)
Using index info to reconstruct a base tree...
M	eng/Version.Details.xml
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
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
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 0002 Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2459709 (internal Microsoft link)
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Jun 4, 2024

@Winniexu01 an error occurred while backporting to release/9.0.1xx-preview5, please check the run log for details!

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

@MichaelSimons
Copy link
Member

@ellahathaway what was the source of the jump in Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.Symbols.x.y.z.nupkg? This grew significantly. I wouldn't expect dotnet-watch and dotnet-format changes to be the source.

@ellahathaway
Copy link
Member

@ellahathaway what was the source of the jump in Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.Symbols.x.y.z.nupkg? This grew significantly. I wouldn't expect dotnet-watch and dotnet-format changes to be the source.

The decrease in Microsoft.CodeAnalysis.Workspaces.MSBuild.x.y.x.nupkg is attributed to dotnet/roslyn#73393. Here is the diff of the nuspec:

image

For the increase in Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.Symbols.x.y.z.nupkg, I found that the XML file grew from 13 KB to 307KB. This would account for 294 KB of the difference. Some of the other items in the package got smaller, but this is major contributing factor for the increase in size difference. Looking into the XML, I believed that most of the diffs were explained by the additions made to https://github.com/dotnet/roslyn/pull/73497/files#diff-ea3d06051f19da7d22479f39e67530bc331eae6e3da3184a0ac5a3b10a1ad795 (same PR as linked above).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants