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 #44461 to release/9.0.2xx #45594

Merged

Conversation

baronfel
Copy link
Member

Backports the "Pin Base Image via Digest" feature from #44461 to the release/9.0.2xx branch.

cc @BeyondEvil

Copy link
Member

@Forgind Forgind left a comment

Choose a reason for hiding this comment

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

This looks like a straight backport, right?

@baronfel
Copy link
Member Author

Yep!

@baronfel baronfel force-pushed the backport-44461-to-9.0.200 branch from 6acc5b3 to bb0a6e5 Compare January 10, 2025 15:50
@baronfel
Copy link
Member Author

Updating base to hopefully get to the state where the macOS arm64 test leg isn't required

@baronfel
Copy link
Member Author

/backport to release/9.0.1xx

Copy link
Contributor

Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/12712743521

@baronfel
Copy link
Member Author

The template-engine test failure is flaky/spurious. Re-running (again).

@baronfel baronfel enabled auto-merge (squash) January 10, 2025 18:50
@baronfel
Copy link
Member Author

baronfel commented Jan 10, 2025

@marcpopMSFT how do you feel about merging on red here? this template engine macOS/x64 test isn't part of what's changed in this PR, and it's repeatedly failing. the same change backported to 9.0.1xx is green - and I'd like to be able to tell Tactics that this is already in 9.0.2xx when asking for the backport :)

@Forgind
Copy link
Member

Forgind commented Jan 10, 2025

@marcpopMSFT how do you feel about merging on red here? this template engine macOS/x64 test isn't part of what's changed in this PR, and it's repeatedly failing. the same change backported to 9.0.1xx is green - and I'd like to be able to tell Tactics that this is already in 9.0.2xx when asking for the backport :)

CanIgnoreTemplateGroupsWithConstraints is the failing test. I've seen it fail in another PR. I'll try to look into it.

@marcpopMSFT
Copy link
Member

@Forgind let me know if you find any confirmation that this failure is systemic by later today and I'll merge on red. With the comment that 9.0.1xx PR is green, I'm inclined to let this in as is.

@Forgind
Copy link
Member

Forgind commented Jan 10, 2025

@Forgind let me know if you find any confirmation that this failure is systemic by later today and I'll merge on red. With the comment that 9.0.1xx PR is green, I'm inclined to let this in as is.

I looked through a bunch of PRs and didn't see examples 🙃 I thought I'd seen it yesterday 🤷 No definitive confirmation.

@marcpopMSFT marcpopMSFT disabled auto-merge January 11, 2025 00:30
@marcpopMSFT
Copy link
Member

Well, I'll merge since it's passing in 1xx and that test should not be impacted by the changes in this PR.

@marcpopMSFT marcpopMSFT merged commit c3fb9d1 into dotnet:release/9.0.2xx Jan 11, 2025
27 of 31 checks passed
@baronfel baronfel deleted the backport-44461-to-9.0.200 branch January 11, 2025 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants