Skip to content

[main] Update dependencies from dotnet/runtime - #26470

Merged
marcpopMSFT merged 7 commits into
mainfrom
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged

[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

Conversation

@dotnet-maestro

@dotnet-maestrodotnet-maestroBot commented Jul 7, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

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

@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost added the Area-CodeFlow label Jul 7, 2022
@dotnet-maestro

dotnet-maestroBot commented Jul 7, 2022

Copy link
Copy Markdown
ContributorAuthor

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

Jason Zhaiand others added 3 commits July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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

kasperk81 commented Jul 10, 2022

Copy link
Copy Markdown
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 after6d4068d).. 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

pavelsavara commented Jul 10, 2022•
edited
Loading

Copy link
Copy Markdown
Member

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

pavelsavara commented Jul 11, 2022

Copy link
Copy Markdown
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

kasperk81 commented Jul 11, 2022

Copy link
Copy Markdown
Contributor

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

@dougbu

dougbu commented Jul 11, 2022

Copy link
Copy Markdown

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

@dougbudougbu mentioned this pull request Jul 11, 2022
Merged
@marcpopMSFT

marcpopMSFT commented Jul 11, 2022

Copy link
Copy Markdown
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
marcpopMSFT enabled auto-merge July 12, 2022 00:02
@marcpopMSFT

marcpopMSFT commented Jul 12, 2022

Copy link
Copy Markdown
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 mainJul 12, 2022
@marcpopMSFT
marcpopMSFT deleted the darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1 branch July 12, 2022 01:36
@danmoseley

danmoseley commented Jul 12, 2022

Copy link
Copy Markdown

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

@marcpopMSFT

marcpopMSFT commented Jul 12, 2022

Copy link
Copy Markdown
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

kasperk81 commented Jul 13, 2022

Copy link
Copy Markdown
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

hoyosjs commented Jul 13, 2022

Copy link
Copy Markdown
Member

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

kasperk81 commented Jul 13, 2022

Copy link
Copy Markdown
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

marcpopMSFT commented Jul 13, 2022

Copy link
Copy Markdown
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees

No one assigned

Labels

Area-CodeFlow

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[main] Update dependencies from dotnet/runtime by dotnet-maestro[bot] · Pull Request #26470 · dotnet/sdk · GitHub
Skip to content
[main] Update dependencies from dotnet/runtime - #26470
Merged
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Jul 12, 2022
Merged
[main] Update dependencies from dotnet/runtime#26470
marcpopMSFT merged 7 commits into
mainfrom 
darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
Conversation
@dotnet-maestro
@dotnet-maestrodotnet-maestroBot
commented
Jul 7, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
ed4f5b9
…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
@ghostghost
added
the 
Area-CodeFlow

label
Jul 7, 2022
@dotnet-maestro
dotnet-maestroBot
commented
Jul 7, 2022

Copy link


Copy Markdown

ContributorAuthor
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
Jason Zhaiand others
added 3 commits
July 8, 2022 02:52
Jason Zhai
Merge branch 'main' ofhttps://github.com/dotnet/sdkinto darc-main-b…
6d4068d
…0738762-11d1-4f67-ac23-7d84d59127d1
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
76214a1
…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
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/runtimebuild 2022…
01205a0
…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
kasperk81
commented
Jul 10, 2022

Copy link


Copy Markdown

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 after6d4068d).. 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
pavelsavara
commented
Jul 10, 2022•

edited

Loading

Copy link


Copy Markdown

Member
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
pavelsavara
commented
Jul 11, 2022

Copy link


Copy Markdown

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
kasperk81
commented
Jul 11, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Looks like something has changed in the runtimeconfig.json format recently. Helix work items are also timing out a lot.
@dougbudougbu
mentioned this pull request
Jul 11, 2022
 Merged

@marcpopMSFT
marcpopMSFT
commented
Jul 11, 2022

Copy link


Copy Markdown

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
marcpopMSFT
enabled auto-merge
July 12, 2022 00:02
@marcpopMSFT
marcpopMSFT
commented
Jul 12, 2022

Copy link


Copy Markdown

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
mainJul 12, 2022
@marcpopMSFT
marcpopMSFT
deleted the

darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1

branch
July 12, 2022 01:36
@danmoseley
danmoseley
commented
Jul 12, 2022

Copy link


Copy Markdown

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

Copy link


Copy Markdown

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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
hoyosjs
commented
Jul 13, 2022

Copy link


Copy Markdown

Member
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
kasperk81
commented
Jul 13, 2022

Copy link


Copy Markdown

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
marcpopMSFT
commented
Jul 13, 2022

Copy link


Copy Markdown

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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@marcpopMSFTmarcpopMSFTmarcpopMSFT approved these changes

Assignees


No one assigned


Labels

Area-CodeFlow

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@kasperk81@pavelsavara@dougbu@marcpopMSFT@danmoseley@hoyosjs