github: workflows: compliance: Ensure no merge commits #52639
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
carlescufi
requested review from
stephanosio,
aescolar,
fabiobaltieri and
gmarull
gmarull
previously approved these changes
Nov 29, 2022
gmarull
reviewed
Nov 29, 2022
carlescufi
force-pushed
the
check-merge-commit
branch
2 times, most recently
from
8b44d4b to
f5a38c1
Compare
stephanosio
previously approved these changes
Nov 29, 2022
carlescufi
force-pushed
the
check-merge-commit
branch
from
c5b88df to
6df3183
Compare
|
@gmarull @stephanosio @fabiobaltieri Currently forcing the failure to see what this looks like. Let me know when you're done looking and I'll remove the merge commit. |
gmarull
reviewed
Nov 29, 2022
I have added the screenshots so I will now rebase, remove the merge commit and leave this PR ready for merging. |
carlescufi
force-pushed
the
check-merge-commit
branch
from
6df3183 to
66d62c8
Compare
gmarull
previously approved these changes
Nov 29, 2022
stephanosio
previously approved these changes
Nov 29, 2022
fabiobaltieri
previously approved these changes
Nov 29, 2022
carlescufi
dismissed stale reviews from fabiobaltieri, stephanosio, and gmarull
via
da7ad2a
carlescufi
force-pushed
the
check-merge-commit
branch
from
66d62c8 to
da7ad2a
Compare
Add a simple one-liner that checks for "0" in the count of merge commits. If a merge commit is present the output will be "1" or higher, failing the job. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
carlescufi
force-pushed
the
check-merge-commit
branch
from
da7ad2a to
4db88d8
Compare
gmarull
approved these changes
Nov 29, 2022
fabiobaltieri
approved these changes
Nov 29, 2022
|
@stephanosio I have had to double the brackets, |
stephanosio
approved these changes
Nov 29, 2022
nashif
approved these changes
Nov 30, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a simple one-liner that checks for "0" in the count of commits with
two or more parents. If a merge commit is present the output will be "1"
or higher, failing the job.
Signed-off-by: Carles Cufi carles.cufi@nordicsemi.no
This is what it looks like: