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.

Sign up for GitHub

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

Jump to bottom

[release/6.0-staging] Merge 1ES templates #103366

Merged
merged 1 commit into from
Jul 10, 2024
Merged

[release/6.0-staging] Merge 1ES templates #103366

merged 1 commit into from
Jul 10, 2024

Conversation

amanasifkhalid
Copy link
Member

@amanasifkhalid amanasifkhalid commented Jun 12, 2024 •
edited
Loading

This merges #99433 to transition the .NET 6 servicing branch over to 1ES templates.

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 12, 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 12, 2024
@dotnet-policy-service Dotnet Policy Service
Copy link
Contributor

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

This was referenced Jun 12, 2024
Open
Open
Open
Open
Open
Closed
@amanasifkhalid amanasifkhalid marked this pull request as ready for review June 12, 2024 23:15
@amanasifkhalid
Copy link
Member Author

amanasifkhalid commented Jun 12, 2024 •
edited
Loading

@jkoritzinsky @agocke PTAL, libraries failures look like #100558. tvOSSimulator build failure is the "no space left on device" issue. Thanks!

@build-analysis build-analysis bot mentioned this pull request Jun 13, 2024
Open
3 tasks
@amanasifkhalid
Copy link
Member Author

ping @jkoritzinsky @agocke

@agocke
Copy link
Member

agocke commented Jun 14, 2024

Things in common should come in from Arcade. Are there missing things that we need to bring in manually?

agocke
agocke reviewed Jun 14, 2024
View reviewed changes
eng/pipelines/runtime.yml Outdated
@@ -147,7 +148,6 @@ extends:
- windows_x86
- windows_arm
- windows_arm64
- FreeBSD_x64
Copy link
Member

Choose a reason for hiding this comment

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

Is this intentional?

Copy link
Member Author

Choose a reason for hiding this comment

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

I initially modeled what Eduardo did in #102681 to reduce the size of runtime.yml by moving some builds to other templates, but after adding the FreeBSD builds back, I'm not getting any complaints about overly large YMLs. I reverted this.

@akoeplinger akoeplinger mentioned this pull request Jun 17, 2024
Merged
@jkoritzinsky
Copy link
Member

Yeah any changes in eng/common we need to merge into Arcade first. Maybe some of these changes aren't needed/there's an alternative equivalent for Arcade 6.0?

@carlossanlop
Copy link
Member

@amanasifkhalid friendly reminder that code complete for the August Release is July 15th. If you want this fix to be included in that release, please merge this PR before that date.

Also, please note there are conflicts that need to be resolved.

@amanasifkhalid
Copy link
Member Author

Maybe some of these changes aren't needed/there's an alternative equivalent for Arcade 6.0?

Yeah, turns out they weren't needed; sorry about that.

I've merged in my fix from #103935, and removed the changes to /eng/common. @agocke @jkoritzinsky could you PTAL? Thanks! Official build.

@build-analysis build-analysis bot mentioned this pull request Jul 4, 2024
Closed
@amanasifkhalid
Copy link
Member Author

@agocke @jkoritzinsky sorry for the pings while you were OOF -- could you PTAL? Thank you!

agocke
agocke approved these changes Jul 9, 2024
View reviewed changes
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, thanks!

jeffschwMSFT
jeffschwMSFT approved these changes Jul 9, 2024
View reviewed changes
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 consider this tell mode.

cc @carlossanlop

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Jul 10, 2024
@amanasifkhalid
Copy link
Member Author

/ba-g public CI blocked by deprecated Helix queue images

@amanasifkhalid amanasifkhalid merged commit ac83237 into dotnet:release/6.0-staging Jul 10, 2024
137 of 150 checks passed
@amanasifkhalid amanasifkhalid deleted the merge-1es-templates branch July 10, 2024 00:54
@github-actions github-actions bot locked and limited conversation to collaborators Aug 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jeffschwMSFT jeffschwMSFT jeffschwMSFT approved these changes

@agocke agocke agocke approved these changes

@marek-safar marek-safar Awaiting requested review from marek-safar

@jkoritzinsky jkoritzinsky Awaiting requested review from jkoritzinsky

Assignees

@amanasifkhalid amanasifkhalid

Labels
area-Infrastructure Servicing-approved Approved for servicing release
Projects
Runtime Infra
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@amanasifkhalid @agocke @jkoritzinsky @carlossanlop @jeffschwMSFT