Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/6.0-staging] Merge #75473 #103266

Conversation

amanasifkhalid
Copy link
Member

@amanasifkhalid amanasifkhalid commented Jun 11, 2024

This introduces new templates from #75473 needed to switch over the .NET 6 servicing branch to 1ES templates. Once this is merged, #102681 (along with some pool provider updates) should be all we need to switch release/6.0-staging over to 1ES templates.

cc @eduardo-vp, @agocke @jkoritzinsky PTAL. Thanks!

Official build

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jun 11, 2024
@amanasifkhalid amanasifkhalid added area-Infrastructure and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jun 11, 2024
@amanasifkhalid amanasifkhalid marked this pull request as ready for review June 11, 2024 15:30
@amanasifkhalid
Copy link
Member Author

amanasifkhalid commented Jun 11, 2024

wasm test failures are #91987. Libraries test failures are #100558.
Like #75473, the LOC changed is large, but most of the changes are whitespace from new indentation.

@jkoritzinsky
Copy link
Member

I would have thought that we'd need #78968 at the same time, but I guess the increased limits we have on the internal pipelines for the 1ES pipeline templates resolved it enough.

@amanasifkhalid
Copy link
Member Author

I would have thought that we'd need #78968 at the same time, but I guess the increased limits we have on the internal pipelines for the 1ES pipeline templates resolved it enough.

Yeah, I do see that some of the templates touched by #102681 were switched over to pipeline-with-resources.yml. I can surgically switch these over, or leave them as-is -- up to you.

Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm. we can treat this as tell mode

cc @carlossanlop

@amanasifkhalid amanasifkhalid added the Servicing-approved Approved for servicing release label Jun 11, 2024
@amanasifkhalid amanasifkhalid merged commit 30900da into dotnet:release/6.0-staging Jun 11, 2024
141 of 149 checks passed
@amanasifkhalid amanasifkhalid deleted the amanasifkhalid/merge-75473 branch June 11, 2024 20:36
@jkoritzinsky
Copy link
Member

I would have thought that we'd need #78968 at the same time, but I guess the increased limits we have on the internal pipelines for the 1ES pipeline templates resolved it enough.

Yeah, I do see that some of the templates touched by #102681 were switched over to pipeline-with-resources.yml. I can surgically switch these over, or leave them as-is -- up to you.

I think we should backport #78968 as part of the next PR to keep consistency between the branches in case we need to propagate more infra changes between the branches.

@amanasifkhalid
Copy link
Member Author

I think we should backport #78968 as part of the next PR to keep consistency between the branches in case we need to propagate more infra changes between the branches.

Got it, that one's coming up next

@github-actions github-actions bot locked and limited conversation to collaborators Jul 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Infrastructure Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants