Skip to content

CI: Do not allow merge if labelled DO-NOT-MERGE - #103337

Merged
hugovk merged 2 commits into
python:mainfrom
hugovk:do-not-merge-if-do-not-merge-label
Apr 9, 2023
Merged

CI: Do not allow merge if labelled DO-NOT-MERGE#103337
hugovk merged 2 commits into
python:mainfrom
hugovk:do-not-merge-if-do-not-merge-label

Conversation

@hugovk

@hugovkhugovk commented Apr 7, 2023•
edited
Loading

Copy link
Copy Markdown
Member

For python/core-workflow#498.

Before switching to GitHub's own auto-merge, we need to make sure it respects the DO-NOT-MERGE label.

We can use https://github.com/mheap/github-action-required-labels to prevent merge if a label exists. We will set this new check as required, and it only passes when DO-NOT-MERGE is absent.

Docs: https://github.com/mheap/github-action-required-labels#prevent-merging-if-a-label-exists

This will also disable the merge button for PRs with DO-NOT-MERGE , regardless of using GitHub auto-merge, which will also help avoid accidental merges.

TODO

Demo

In my fork, I've set the check to required and created a demo PR: hugovk#47

No label: can merge

image

With label: cannot merge

image

@hugovkhugovk mentioned this pull request Apr 7, 2023
Closed
pradyunsg
pradyunsg approved these changes Apr 7, 2023
View reviewed changes
Comment thread.github/workflows/require-pr-label.yml Outdated
sobolevn
sobolevn reviewed Apr 7, 2023
View reviewed changes

@sobolevnsobolevn left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good!
Require PR label seems like an odd name for this workflow, though.

Maybe it can be more generic like Check PR labels?

Comment thread.github/workflows/require-pr-label.yml Outdated
Mariatta
Mariatta reviewed Apr 7, 2023
View reviewed changes
Comment thread.github/workflows/require-pr-label.yml Outdated
CAM-Gerlach
CAM-Gerlach reviewed Apr 8, 2023
View reviewed changes

@CAM-GerlachCAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great idea overall; I'd been wanting to add something like this for a while now. We should probably backport this at least to 3.11, since automerge functionality is particularly common on auto-backport PRs.

Comment thread.github/workflows/require-pr-label.yml Outdated
Comment thread.github/workflows/require-pr-label.yml
Comment thread.github/workflows/require-pr-label.yml Outdated
@hugovkhugovk added the needs backport to 3.11 only security fixes label Apr 8, 2023
@hugovk@CAM-Gerlach
Rename workflow and step, update action
652de6c
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
sobolevn
sobolevn approved these changes Apr 8, 2023
View reviewed changes

@sobolevnsobolevn left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM 👍

Shout out to @mheap for developing this useful GH action 👋

CAM-Gerlach
CAM-Gerlach approved these changes Apr 9, 2023
View reviewed changes

@CAM-GerlachCAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM now, thanks @hugovk !

@hugovk
hugovk merged commit 090e26e into python:mainApr 9, 2023
@miss-islington

miss-islington commented Apr 9, 2023

Copy link
Copy Markdown
Contributor

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@hugovk
hugovk deleted the do-not-merge-if-do-not-merge-label branch April 9, 2023 06:39
@bedevere-bot

bedevere-bot commented Apr 9, 2023

Copy link
Copy Markdown

GH-103393 is a backport of this pull request to the 3.11 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.11 only security fixes label Apr 9, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 9, 2023
@hugovk@CAM-Gerlach@miss-islington
CI: Do not allow merge if labelled DO-NOT-MERGE (pythonGH-103337)
0571c01
(cherry picked from commit 090e26e)
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
miss-islington added a commit that referenced this pull request Apr 9, 2023
@miss-islington@hugovk@CAM-Gerlach
CI: Do not allow merge if labelled DO-NOT-MERGE (GH-103337)
da3b77b
(cherry picked from commit 090e26e)
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
warsaw pushed a commit to warsaw/cpython that referenced this pull request Apr 11, 2023
@hugovk@CAM-Gerlach@warsaw
CI: Do not allow merge if labelled DO-NOT-MERGE (python#103337)
4a05ad3
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
@hugovkhugovk mentioned this pull request Apr 20, 2023
Closed
@bedevere-bot

bedevere-bot commented Apr 20, 2023

Copy link
Copy Markdown

GH-103641 is a backport of this pull request to the 3.10 branch.

@arhadthedevarhadthedev mentioned this pull request Apr 24, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MariattaMariattaMariatta left review comments
@pradyunsgpradyunsgpradyunsg approved these changes
@sobolevnsobolevnsobolevn approved these changes
@CAM-GerlachCAM-GerlachCAM-Gerlach approved these changes
@ezio-melottiezio-melottiAwaiting requested review from ezio-melottiezio-melotti is a code owner

Assignees

No one assigned

Labels

skip issueskip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@hugovk@miss-islington@bedevere-bot@pradyunsg@sobolevn@Mariatta@CAM-Gerlach