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.

Sign up for GitHub

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

Jump to bottom

[DO NOT MERGE][RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge #1506

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

[DO NOT MERGE][RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge #1506

wants to merge 11 commits into from

Conversation

petracihalova
Copy link
Contributor

@petracihalova petracihalova commented Feb 12, 2025 •
edited
Loading

RHCLOUD-37825

adds new GH action to avoid to merge the PR with the fixup commits
https://github.com/skjnldsv/block-fixup-merge-action

@petracihalova petracihalova changed the title github action to check if the PR contains some fixup commits that is needed to resolve before the merge [RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge Feb 12, 2025
@petracihalova
Copy link
Contributor Author

/retest

@petracihalova
Copy link
Contributor Author

the Git Checks / block-fixup is failing but this is expected as it is an example of usage of this new GitHub action ... after this PR will be approved, I will do the rebase and autosquash

@petracihalova
Copy link
Contributor Author

it looks like because the merge commit the tool does not recognise the fixup commits ... need to take a look on this again 🤔

@petracihalova petracihalova changed the title [RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge [WIP][RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge Feb 12, 2025
@petracihalova petracihalova force-pushed the block-fixup-commit-merge branch 7 times, most recently from fa34f8c to 8fc27f9 Compare February 12, 2025 17:53
@petracihalova petracihalova force-pushed the block-fixup-commit-merge branch from 8fc27f9 to f699c70 Compare February 12, 2025 19:10
@petracihalova
Copy link
Contributor Author

/retest

2 similar comments
@vbelchio
Copy link
Contributor

/retest

@vbelchio
Copy link
Contributor

/retest

@petracihalova
Copy link
Contributor Author

/retest

@petracihalova petracihalova changed the title [WIP][RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge [RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge Feb 18, 2025
@petracihalova
Copy link
Contributor Author

  • Git Checks / Block Autosquash Commits is failing = expected, I will do the interactive rebase after PR approval

  • RH Konflux / rbac-bonfire-tekton-testing is pending/failing = expected, it is leftover from the Konflux issue we faced and already fixed, you can check that the RH Konflux / rbac-bonfire-tekton is successfull

@petracihalova petracihalova changed the title [RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge [DO NOT MERGE][RHCLOUD-37825] github action to check if the PR contains some fixup commits that is needed to resolve before the merge Feb 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
developer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@petracihalova @vbelchio @lpichler