[release/10.0.3xx] Source code updates from dotnet/dotnet#9754
[release/10.0.3xx] Source code updates from dotnet/dotnet#9754dotnet-maestro[bot] wants to merge 11 commits intorelease/10.0.3xxfrom
Conversation
| ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] | ||
| image: Azure-Linux-3-Amd64 | ||
| image: 1es-mariner-2 |
There was a problem hiding this comment.
This will break the build. We need to wait until the Arcade version in the 10 version of Arcade properly flows to the VMR and then back into this PR. CC @MichaelSimons
There was a problem hiding this comment.
This will break the build. We need to wait until the Arcade version in the 10 version of Arcade properly flows to the VMR and then back into this PR
@MichaelSimons @MiYanni Has this happened? Can we merge this PR?
There was a problem hiding this comment.
Yeah, you cannot run 1es-mariner-2 in CI currently (for this repo). There was a separate discussion on it, but Sean ended up hotfixing it here to fix the build: #9736
But this change has occurred in Arcade at this point. But we cannot merge this PR reverting that hotfix or CI builds will immediately stop working. VMR needs the right Arcade version to flow to it so it can flow here, so this hotfix won't be reverted.
There was a problem hiding this comment.
Yeah, it is correct in release/10.0 for Arcade here: https://github.com/dotnet/arcade/blob/release/10.0/eng/common/core-templates/job/source-build.yml#L66
It has to be that value/version that flows to the VMR and then flows back here.
There was a problem hiding this comment.
@MichaelSimons we disabled source build in main. Can we do all 10+ branches as well?
I know we still need these for 8/9.
There was a problem hiding this comment.
@marcpopMSFT Why is it taking so long for Arcade 10 updates to flow into this PR? Is something wrong with the flow from Arcade 10 to VMR to templating? The change we need is over 3 weeks old...
![]()
There was a problem hiding this comment.
Trying darc trigger-subscriptions --id bbf9aa7e-217b-4275-99d1-5f23eb747967 --force to see if that helps.
There was a problem hiding this comment.
@premun even after a force on the subscription, no new flows came through. Is there a bug in maestro or is this PR out of sync somehow blocking the backflow?
There was a problem hiding this comment.
@marcpopMSFT I will have a look. Force-triggering should work. In the meantime, it's also possible to close this one and let a new one re-open (if there are no manual changes which I don't see here)
There was a problem hiding this comment.
The problem seems to be that the --force does not override the block described in #9754 (comment). I logged dotnet/arcade-services#5908 and I would suggest closing here and re-triggering.
…bdf-4be2-9a2a-bf5a9bc1b854
|
Known issue dotnet/sdk#51574. |
…bdf-4be2-9a2a-bf5a9bc1b854
…bdf-4be2-9a2a-bf5a9bc1b854
…bdf-4be2-9a2a-bf5a9bc1b854
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
…bdf-4be2-9a2a-bf5a9bc1b854
…bdf-4be2-9a2a-bf5a9bc1b854
|
Closing and retriggering per Premek as all of the commits are maestro or merges. |
|
@DonnaChen888 I noticed a lot of merge commits. I assume you were doing that to retrigger the pipelines. Do you know if the UI had the rebase option when you were doing that as if you're using the Update Branch button, I'd prefer a rebase so we don't get extra commits. Also, if there aren't any changes to the branch that are going to fix the problem and it's just test flakiness, it's probably better to just rerun the pipeline rather than remerge (that's my recommendation for templating where generally it's test flakiness rather than other changes needed). Makes sense? You can rerun tests through GitHub on the Checks tab or in the Azure DevOps pipeline or through an "/azp run templating-ci" command (different for each repo). |
I used GitHub’s Update branch button to retrigger CI. Thanks for the reminder — going forward, if it’s just test flakiness I’ll rerun the checks/pipeline instead; and if the branch really needs updating, I’ll prefer a rebase to avoid extra merge commits. |
Note
This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch