From b683574f6af3a3392e8b5833741d800905212afc Mon Sep 17 00:00:00 2001 From: dark0dave Date: Thu, 14 Dec 2023 11:00:00 +0000 Subject: [PATCH] feat(commitizen): Use commitizen instead of custom script Signed-off-by: dark0dave --- Makefile | 7 +------ scripts/git-check-commits.sh | 21 --------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100755 scripts/git-check-commits.sh diff --git a/Makefile b/Makefile index c79ebf9a..c4d5dd71 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ $(RELEASE_DIR)/%-$(RELEASE_SUFFIX): $(BIN_DIR)/%-$(BIN_ARCH)$(BIN_SUFFIX) $(TAR) -cvz --transform 's,$(BIN_DIR)/$(*)-$(BIN_ARCH)$(BIN_SUFFIX),$(*)$(BIN_SUFFIX),gi' -f "$@" "$<" ## Run Go tests -test: test-fmt test-git +test: test-fmt go test -v -coverprofile fmtcoverage.html ./... .PHONY: test @@ -91,11 +91,6 @@ test-fmt: test -z "$$(go fmt ./...)" .PHONY: test-fmt -## Check git commits formatting -test-git: - ./scripts/git-check-commits.sh -.PHONY: test-git - ## Clean build artifacts clean: rm -rf $(BIN_DIR) $(RELEASE_DIR) diff --git a/scripts/git-check-commits.sh b/scripts/git-check-commits.sh deleted file mode 100755 index 13fc7c74..00000000 --- a/scripts/git-check-commits.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh -# Set strict error checking -set -eou pipefail - -BASE_REF="origin/master" -COMMIT_TYPES="build|chore|ci|dep|docs|feat|fix|ref|style|test" -COMMIT_REGEXP="^(${COMMIT_TYPES}): [A-Z]+.{5,}[^.]$" - -# Needed for ci -git config --global --add safe.directory "${GITHUB_WORKSPACE:-$PWD}" || true - -COMMITS_COUNT="$(git log --oneline --no-merges "${BASE_REF}..HEAD" | wc -l)" - -echo "- Checking commit messages: ${COMMITS_COUNT} commits" - -BAD_COMMITS="$(git log --oneline --no-merges -E --invert-grep --grep="${COMMIT_REGEXP}" "${BASE_REF}..HEAD")" -if [ -n "${BAD_COMMITS}" ]; then - echo "${BAD_COMMITS}" - echo "Error: commit messages do no confirm to required format: ${COMMIT_REGEXP}" - exit 1 -fi