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

[main] Update dependencies from dotnet/runtime #26470

Merged
merged 7 commits into from
Jul 12, 2022

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 7, 2022

This pull request updates the following dependencies

From https://github.com/dotnet/runtime

  • Subscription: aa69f164-2492-460a-3914-08d8e9750bf8
  • Build: 20220708.7
  • Date Produced: July 9, 2022 10:11:43 AM UTC
  • Commit: 1967649721058a457157d4321af3e6fceaa5441b
  • Branch: refs/heads/main

…0706.9

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-preview.6.22356.1 -> To Version 7.0.0-preview.6.22356.9
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jul 7, 2022

Notification for subscribed users from https://github.com/dotnet/runtime:

@dnr-codeflow

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/runtime) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

v-wuzhai and others added 3 commits July 8, 2022 02:52
…0707.4

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-preview.6.22356.1 -> To Version 7.0.0-preview.6.22357.4
…0708.7

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-preview.6.22356.1 -> To Version 7.0.0-preview.7.22358.7
@kasperk81
Copy link
Contributor

@mmitche, @hoyosjs, the bot opened this pr at the time when main branch was broken ("Expected JSON document {" error in ci). few hours later, the main branch was fixed (which happened after 6d4068d).. but the bot does not merge target branch (main) to the existing pr branch which causes delays and increases the chances of other kinds of breakages to kick in. more bad news for people waiting to test daily (these days, weekly) builds days before the rc1.

is there anything which can be done to improve the process and make it as automated as possible? like make bot to merge target branch to pr's source branch when pushing the new commit. if there is a merge conflict, close the pr and start fresh from tip of the target branch.

@pavelsavara
Copy link
Member

pavelsavara commented Jul 10, 2022

My PR dotnet/runtime#66304 will remove System.Private.Runtime.InteropServices.JavaScript.dll which will probably break Blazor unit tests in the SDK. I will start looking at it on Monday morning. FYI @radical

It will need something like 68a51c7

@pavelsavara
Copy link
Member

Runtime progress is currently blocked by error : Failed to publish package 'Microsoft.SourceBuild.Intermediate.runtime.centos.7-x64@7.0.0-preview.7.22360.3' to '[https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json'](https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json%27) 413 (Request Entity Too Large - Package is too large. Size limit is 524288000 bytes. See log

@kasperk81
Copy link
Contributor

@pavelsavara could you merge main to darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1? it will at least unblock this pr

@dougbu
Copy link
Member

dougbu commented Jul 11, 2022

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.

@marcpopMSFT
Copy link
Member

The timeouts are likely infrastructure/networking. There is a test that was updated to target the current runtime but the test then requires the exact runtime build (so needed to be fixed with each insertion). I tried reverting it back to net6.0 and we'll see if that helps.

@marcpopMSFT
Copy link
Member

The legs that ran, passed. Some of the legs failed to even find a machine and rerunning those now.

@marcpopMSFT marcpopMSFT merged commit 6a2d9c0 into main Jul 12, 2022
@marcpopMSFT marcpopMSFT deleted the darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1 branch July 12, 2022 01:36
@danmoseley
Copy link
Member

@mmitche, @hoyosjs, @kasperk81 is there any followup here? @marcpopMSFT pointed out this codeflow was slower than normal.
@marek-safar

@marcpopMSFT
Copy link
Member

Looking at the timeline, this was opened July 7th (Thursday) and failed (pinging the dnr-codeflow team), then my vendor tried to fix by merging with main on July 8th, then folks engaged on July 10th (Sunday) and got the merge fixed then, I engaged yesterday when some sdk test issue was identified, and we got it merged. I think the concern from tactics is that aspnet was blocked flowing into installer so this being delayed 5 days put aspnet even further behind.

So the question is what could have happened those first two days to improve our speed on these?

@kasperk81
Copy link
Contributor

tried to fix by merging with main

can we automate this bit? say the bot can try to merge target branch (main) to active darc branches when it is updating the existing branch again (for runtime it happens once a day).

it may not "fix" everything, but it will avoid the mandatory manual/human action in cases when main was broken at the time of creation of darc branch by bot, and then main gets fixed subsequently. alternatively, some ci systems (before devops when dotnet repositories were using Jenkins) merge source to target branch after the git checkout, we can configure devops to do the same.

@hoyosjs
Copy link
Member

hoyosjs commented Jul 13, 2022

Every time there's a new commit to the branch (i.e. an update through a commit), GitHub will create a new merge. For example:
image
and
image

You can see those two commits going to different tips of main without having manual intervention.

@kasperk81
Copy link
Contributor

that's awesome. assuming devops checkout that merge commit during ci runs for ongoing prs, then we don't need any action for this.

@marcpopMSFT
Copy link
Member

Yeah, I don't know why the merge with main was done (maybe there was a merge conflict that couldn't be resolved in the UI) as every new change should run the build with fully merged sources.

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.

7 participants