Skip to content

Commit c181181

Browse files
committed
Fix excluding the merge commit from gitlint
This wasn't working properly, add a -x because i am still mesmerized by the fact that it was working on my local laptop and fail in CI.
1 parent 04a2fbd commit c181181

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.tekton/linter.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ spec:
6565
image: jorisroovers/gitlint
6666
workingDir: $(workspaces.source.path)
6767
script: |
68+
set -x
6869
git config --global --add safe.directory /workspace/source
6970
# don't lint merge commit
70-
git log -1 |grep -q '^Merge:' && exit 0
71+
git log -1 |grep -E -q '^Merge:' && exit 0
7172
gitlint --commit "$(git log --format=format:%H --no-merges -1)" --ignore "Merge branch"
7273
7374
- name: yamllint

0 commit comments

Comments
 (0)