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

github: Reject merge commits in pull requests in ci-lint workflow #107

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

tjanez
Copy link
Member

@tjanez tjanez commented Aug 27, 2021

No description provided.

@tjanez
Copy link
Member Author

tjanez commented Aug 27, 2021

NOTE: I'll leave this in failed state so the reviewer(s) can see how it works.

Before merging, I'll rebase it and remove the XXX commit.

with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# Run this step even if the previous one fails so that all linting
# errors can be seen at once. BLA
Copy link
Member

Choose a reason for hiding this comment

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

BLA? :D

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, that's in the XXX commit 😀

Comment on lines +49 to +51
uses: Morishiri/[email protected]
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
Copy link
Member

Choose a reason for hiding this comment

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

I don't like their error message "1 commit(s) cannot be merged", but it isn't configurable :(

@pro-wh
Copy link
Contributor

pro-wh commented Aug 27, 2021

opposing this

we'll want merging for times when we neither want to rewrite all commits nor want to squash everything into a single commit

Copy link
Contributor

@pro-wh pro-wh left a comment

Choose a reason for hiding this comment

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

opposing this (see conversation tab)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants