Skip to content

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

Merged
edvilme merged 10 commits intodotnet:mainfrom
edvilme:edvilme-actions-lockdown
Feb 10, 2025
Merged

Workflows: Don't allow merge if pr in lockdown#46663
edvilme merged 10 commits intodotnet:mainfrom
edvilme:edvilme-actions-lockdown

Conversation

@edvilme
Copy link
Copy Markdown
Contributor

@edvilme edvilme commented Feb 8, 2025 •
edited
Loading

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.

@ghost ghost 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
Forgind
Forgind approved these changes Feb 9, 2025
View reviewed changes
@Forgind
Copy link
Copy Markdown
Contributor

Forgind commented Feb 9, 2025

Can we make this a required check?
image

I can still merge over it if I want.

@edvilme @Forgind
Fix typo
cd4bd10 
Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
@edvilme
Copy link
Copy Markdown
Contributor Author

edvilme commented Feb 9, 2025 •
edited
Loading

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 e6d0309 to cd4bd10 Compare February 9, 2025 20:22
This was referenced Feb 9, 2025
Closed
Open
Closed
marcpopMSFT
marcpopMSFT reviewed Feb 10, 2025
View reviewed changes
edvilme
edvilme commented Feb 10, 2025
View reviewed changes
@edvilme edvilme force-pushed the edvilme-actions-lockdown branch from 67a443a to 2a439c2 Compare February 10, 2025 19:38
@marcpopMSFT
Copy link
Copy Markdown
Member

marcpopMSFT commented Feb 10, 2025

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

@edvilme
Copy link
Copy Markdown
Contributor 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
Copy Markdown
Contributor Author

edvilme commented Feb 10, 2025

/backport to release/8.0.1xx

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 10, 2025

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 10, 2025

@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
@edvilme @Forgind
Workflows: Don't allow merge if pr in lockdown (dotnet#46663)
bf15f5f 
Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
@edvilme edvilme mentioned this pull request Feb 10, 2025
Merged
edvilme added a commit that referenced this pull request Feb 11, 2025
@edvilme @Forgind
[Backport to 8.0.1xx] Workflows: Don't allow merge if pr in lockdown (#…
c549b5e 
…46663) (#46695)

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
edvilme added a commit to edvilme/sdk that referenced this pull request Feb 26, 2025
@edvilme @Forgind
Workflows: Don't allow merge if pr in lockdown (dotnet#46663)
529c769 
Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
@edvilme edvilme mentioned this pull request Feb 26, 2025
Merged
edvilme added a commit that referenced this pull request Feb 26, 2025
@edvilme @Forgind
[Backport to 9.0.1xx] Workflows: Don't allow merge if pr in lockdown (#…
5ff7dda 
…46663) (#47142)

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcpopMSFT marcpopMSFT marcpopMSFT approved these changes

+1 more reviewer

@Forgind Forgind Forgind approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Area-Infrastructure untriaged Request triage from a team member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@edvilme @Forgind @marcpopMSFT