Skip to content

Commit 522b86e

Browse files
authored
Merge pull request #360 from dafyddj/ci/commitlint-fix
ci(gitlab-ci): remove amended commit due to `coqbot`
2 parents dd22970 + d14b2cf commit 522b86e

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,6 @@ commitlint:
9494
# Set default commit hashes for `--from` and `--to`
9595
- 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
9696
- 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
97-
# `coqbot` adds a merge commit to test PRs on top of the latest commit in
98-
# the repo; amend this merge commit message to avoid failure
99-
- |
100-
if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
101-
&& [ "${CI_COMMIT_BRANCH}" != "master" ]; then
102-
git commit --amend -m \
103-
'chore: reword coqbot merge commit message for commitlint'
104-
export COMMITLINT_TO=HEAD
105-
fi
10697
# Run `commitlint`
10798
- 'commitlint --from "${COMMITLINT_FROM}"
10899
--to "${COMMITLINT_TO}"

0 commit comments

Comments
 (0)