Skip to content

Commit 02a0b8d

Browse files
committed
ci: don't consider merge commits in the signed-off-by workflow
Merge commits don't get a `Signed-off-by` tag. Signed-off-by: Benno Lossin <[email protected]>
1 parent ea1fcbf commit 02a0b8d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
fetch-depth: ${{github.event.pull_request.commits}}
210210
ref: ${{github.event.pull_request.head.sha}}
211211
- run: git config user.name "github-runner" && git config user.email "<>"
212-
- run: git rebase --exec 'git log -1 --pretty=format:%B | grep -q "^Signed-off-by:"' --root
212+
- run: git rebase --exec 'git log --no-merges -1 --pretty=format:%B | grep -q "^Signed-off-by:"' --root
213213
apply:
214214
runs-on: ubuntu-latest
215215
steps:

0 commit comments

Comments
 (0)