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

Backport #92296 and #92438 to release/6.0-staging #101822

Merged

Conversation

amanasifkhalid
Copy link
Member

@amanasifkhalid amanasifkhalid commented May 2, 2024

This is the first of multiple PRs to replicate @eduardo-vp's work of merging commits needed to transition the release/6.0-staging branch to 1ES pipeline templates. Because this branch and main have diverged quite a bit, I found it safer to manually merge each change by hand, rather than relying on git cherry-pick. As such, this PR probably warrants extra scrutiny...

Official build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2448493&view=results

cc @agocke @jkoritzinsky

@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 May 2, 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 May 2, 2024
Copy link
Contributor

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

@amanasifkhalid
Copy link
Member Author

/azp run runtime

Copy link

Azure Pipelines failed to run 1 pipeline(s).

@amanasifkhalid amanasifkhalid changed the title Test Backport #92296 and #92438 to release/6.0-staging May 10, 2024
@amanasifkhalid amanasifkhalid marked this pull request as ready for review May 10, 2024 01:41
@amanasifkhalid
Copy link
Member Author

Failures in public CI are known

@amanasifkhalid
Copy link
Member Author

ping @agocke (sorry, I didn't realize Jeremy is out of office at the moment)

Copy link
Member

@agocke agocke left a comment

Choose a reason for hiding this comment

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

LGTM. FYI, if the PGO build is broken, we probably won't find the issue until it flows up the stack. There's nothing to do about that, it's just the way it works.

@amanasifkhalid
Copy link
Member Author

Thank you!

LGTM. FYI, if the PGO build is broken, we probably won't find the issue until it flows up the stack. There's nothing to do about that, it's just the way it works.

I see, I'll keep this in mind.

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.

approved. we can treat this as tell mode, merge when ready

cc @carlossanlop

@amanasifkhalid amanasifkhalid added the Servicing-approved Approved for servicing release label May 13, 2024
@amanasifkhalid amanasifkhalid merged commit e50e868 into dotnet:release/6.0-staging May 13, 2024
164 of 170 checks passed
@amanasifkhalid amanasifkhalid deleted the release/6.0-staging branch May 13, 2024 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-Infrastructure Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants