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

Add workflow to ensure no merge commits are included #12809

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Mab879
Copy link
Member

@Mab879 Mab879 commented Jan 10, 2025

Description:

I have been thinking about adding this check for while. This should reduce the load on maintainers and reduce the risk of a maintainer missing this style guide requirement.

Rationale:

Reduce load on maintainers.

Review Hints:

I can add a merge commit on request. Let me know if you want this.

@Mab879 Mab879 added the Infrastructure Our content build system label Jan 10, 2025
@Mab879 Mab879 added this to the 0.1.76 milestone Jan 10, 2025
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

Copy link

codeclimate bot commented Jan 10, 2025

Code Climate has analyzed commit f80889f and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 61.8% (0.0% change).

View more on Code Climate.

@sej7278
Copy link

sej7278 commented Jan 10, 2025

Might be worth adding documentation as to the preferred method for avoiding merge commits - squash, rebase etc.

@Mab879
Copy link
Member Author

Mab879 commented Jan 10, 2025

Might be worth adding documentation as to the preferred method for avoiding merge commits - squash, rebase etc.

We have sight preference for rebasing, see https://complianceascode.readthedocs.io/en/latest/manual/developer/04_style_guide.html#pull-requests.

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

Successfully merging this pull request may close these issues.

2 participants