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

Workflows: Don't allow merge if pr in lockdown #46663

Merged
merged 10 commits into from
Feb 10, 2025

Conversation

edvilme
Copy link
Member

@edvilme edvilme commented Feb 8, 2025

There are several situations where we do not want to merge PRs (ie, branch lockdown or "DO NOT MERGE" labels). This adds an extra check to ensure that PRs are not merged in this cases.

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Feb 8, 2025
@edvilme edvilme marked this pull request as ready for review February 8, 2025 07:58
.github/workflows/branch-lockdown.yml Outdated Show resolved Hide resolved
@Forgind
Copy link
Member

Forgind commented Feb 9, 2025

Can we make this a required check?
image

I can still merge over it if I want.

Co-authored-by: Forgind <[email protected]>
@edvilme
Copy link
Member Author

edvilme commented Feb 9, 2025

Can we make this a required check? image

I can still merge over it if I want.

I will look into that, but I think that is managed from the repo's settings, although I may be mistaken. Additionally, I updated it to only trigger on label/unlabel to avoid unnecessary runs :) Update, I think it is important for the check to run on every commit too.

@edvilme edvilme force-pushed the edvilme-actions-lockdown branch from 67a443a to 2a439c2 Compare February 10, 2025 19:38
@marcpopMSFT
Copy link
Member

@edvilme I added the label check as a required check in main if you want to test it.

@edvilme
Copy link
Member Author

edvilme commented Feb 10, 2025

@edvilme I added the label check as a required check in main if you want to test it.
image
Yes, it now shows as required, thanks!!

@edvilme edvilme enabled auto-merge (squash) February 10, 2025 22:20
@edvilme
Copy link
Member Author

edvilme commented Feb 10, 2025

/backport to release/8.0.1xx

Copy link
Contributor

Started backporting to release/8.0.1xx: https://github.com/dotnet/sdk/actions/runs/13251599445

Copy link
Contributor

@edvilme an error occurred while backporting to "release/8.0.1xx", please check the run log for details!

The process '/usr/bin/git' failed with exit code 1

@edvilme edvilme merged commit b8e709b into dotnet:main Feb 10, 2025
41 of 43 checks passed
edvilme added a commit to edvilme/sdk that referenced this pull request Feb 10, 2025
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.

3 participants