Skip to content

Commit 0a7dd4a

Browse files
mbazhlekovambazhlekova
authored
fix(deps): remove go-gitlint (#241)
1 parent 84179f6 commit 0a7dd4a

File tree

5 files changed

+163
-172
lines changed

5 files changed

+163
-172
lines changed

‎.githooks/commit-msg‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
#!/bin/sh
22

3-
echo
4-
echo "Checking commit message format..."
5-
echo
3+
RED="\033[0;31m"
4+
END_COLOR="\033[0m"
65

7-
make lint-commit COMMIT_MSG_FILE=$1
6+
commit_types="(chore|docs|feat|fix|refactor|tests?)"
7+
conventional_commit_regex="^${commit_types}(\([a-z \-]+\))?!?: .+$"
8+
9+
commit_message=$(cat "$1")
10+
11+
if [[ "$commit_message" =~ $conventional_commit_regex ]]; then
12+
echo "Commit message meets Conventional Commit standards..."
13+
exit 0
14+
fi
15+
echo
16+
echo "${RED}Commit lint failed. Please update your commit message format. ${END_COLOR}"
17+
echo "Example commit messages:"
18+
echo " feat(scope): add your feature description here"
19+
echo " fix(scope): add your fix description here"
20+
echo " chore(scope): add your chore description here"
21+
echo " docs(scope): add your docs description here"
22+
echo " refactor(scope): add your refactor description here"
23+
echo " tests(scope): add your tests description here"
24+
echo
25+
26+
exit 1

‎build/lint.mk‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ MISSPELL ?= misspell
77
GOFMT ?= gofmt
88
GOIMPORTS ?= goimports
99

10-
COMMIT_LINT_CMD ?= go-gitlint
11-
COMMIT_LINT_REGEX ?= "(chore|docs|feat|fix|refactor|tests?)(\([^\)]+\))?!?: .*"
12-
COMMIT_LINT_START ?= "2020-07-14"
13-
1410
GOLINTER = golangci-lint
1511

1612
EXCLUDEDIR ?= .git
@@ -22,7 +18,7 @@ PROJECT_MODULE ?= $(shell $(GO) list -m)
2218

2319
GO_MOD_OUTDATED ?= go-mod-outdated
2420

25-
lint: deps spell-check gofmt lint-commit golangci goimports outdated
21+
lint: deps spell-check gofmt golangci goimports outdated
2622
lint-fix: deps spell-check-fix gofmt-fix goimports
2723

2824
#
@@ -48,10 +44,6 @@ goimports: deps
4844
@echo "=== $(PROJECT_NAME) === [ goimports ]: Checking imports with $(GOIMPORTS)..."
4945
@$(GOIMPORTS) -l -w -local $(PROJECT_MODULE) $(GO_FILES)
5046

51-
lint-commit: deps
52-
@echo "=== $(PROJECT_NAME) === [ lint-commit ]: Checking that commit messages are properly formatted ($(COMMIT_LINT_CMD))..."
53-
@$(COMMIT_LINT_CMD) --since=$(COMMIT_LINT_START) --subject-minlen=10 --subject-maxlen=120 --subject-regex=$(COMMIT_LINT_REGEX)
54-
5547
golangci: deps
5648
@echo "=== $(PROJECT_NAME) === [ golangci-lint ]: Linting using $(GOLINTER) ($(COMMIT_LINT_CMD))..."
5749
@$(GOLINTER) run
@@ -60,4 +52,4 @@ outdated: deps tools-outdated
6052
@echo "=== $(PROJECT_NAME) === [ outdated ]: Finding outdated deps with $(GO_MOD_OUTDATED)..."
6153
@$(GO) list -u -m -json all | $(GO_MOD_OUTDATED) -direct -update
6254

63-
.PHONY: lint spell-check spell-check-fix gofmt gofmt-fix lint-fix lint-commit outdated goimports
55+
.PHONY: lint spell-check spell-check-fix gofmt gofmt-fix lint-fix outdated goimports

‎tools/go.mod‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/git-chglog/git-chglog v0.15.4
99
github.com/golangci/golangci-lint v1.51.1
1010
github.com/goreleaser/goreleaser v1.19.2
11-
github.com/llorllale/go-gitlint v0.0.0-20210608233938-d6303cc52cc5
1211
github.com/psampaz/go-mod-outdated v0.9.0
1312
github.com/stretchr/testify v1.8.4
1413
github.com/x-motemen/gobump v0.2.0
@@ -81,8 +80,8 @@ require (
8180
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect
8281
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
8382
github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // indirect
84-
github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 // indirect
83+
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.5 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.5 // indirect
8685
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
8786
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9 // indirect
8887
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect
@@ -93,7 +92,7 @@ require (
9392
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
9493
github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 // indirect
9594
github.com/aws/smithy-go v1.19.0 // indirect
96-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
95+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04 // indirect
9796
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
9897
github.com/bahlo/generic-list-go v0.2.0 // indirect
9998
github.com/beorn7/perks v1.0.1 // indirect
@@ -111,14 +110,14 @@ require (
111110
github.com/caarlos0/go-reddit/v3 v3.0.1 // indirect
112111
github.com/caarlos0/go-shellwords v1.0.12 // indirect
113112
github.com/caarlos0/go-version v0.1.1 // indirect
114-
github.com/caarlos0/log v0.4.4 // indirect
113+
github.com/caarlos0/log v0.4.2 // indirect
115114
github.com/cavaliergopher/cpio v1.0.1 // indirect
116115
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
117116
github.com/cespare/xxhash/v2 v2.2.0 // indirect
118117
github.com/charithe/durationcheck v0.0.9 // indirect
119-
github.com/charmbracelet/lipgloss v0.9.1 // indirect
118+
github.com/charmbracelet/lipgloss v0.7.1 // indirect
120119
github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348 // indirect
121-
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
120+
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08 // indirect
122121
github.com/chzyer/readline v1.5.1 // indirect
123122
github.com/cloudflare/circl v1.3.7 // indirect
124123
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
@@ -134,16 +133,15 @@ require (
134133
github.com/dghubble/oauth1 v0.7.2 // indirect
135134
github.com/dghubble/sling v1.4.0 // indirect
136135
github.com/dimchansky/utfbom v1.1.1 // indirect
137-
github.com/disgoorg/disgo v0.16.11 // indirect
136+
github.com/disgoorg/disgo v0.16.7 // indirect
138137
github.com/disgoorg/json v1.1.0 // indirect
139-
github.com/disgoorg/log v1.2.1 // indirect
138+
github.com/disgoorg/log v1.2.0 // indirect
140139
github.com/disgoorg/snowflake/v2 v2.0.1 // indirect
141-
github.com/distribution/reference v0.5.0 // indirect
142140
github.com/dnephin/pflag v1.0.7 // indirect
143-
github.com/docker/cli v24.0.7+incompatible // indirect
144-
github.com/docker/distribution v2.8.3+incompatible // indirect
145-
github.com/docker/docker v24.0.7+incompatible // indirect
146-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
141+
github.com/docker/cli v23.0.5+incompatible // indirect
142+
github.com/docker/distribution v2.8.2+incompatible // indirect
143+
github.com/docker/docker v24.0.2+incompatible // indirect
144+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
147145
github.com/docker/go-connections v0.4.0 // indirect
148146
github.com/docker/go-units v0.5.0 // indirect
149147
github.com/elliotchance/orderedmap/v2 v2.2.0 // indirect
@@ -162,15 +160,16 @@ require (
162160
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
163161
github.com/go-git/go-billy/v5 v5.5.0 // indirect
164162
github.com/go-git/go-git/v5 v5.11.0 // indirect
163+
github.com/go-logr/logr v1.3.0 // indirect
165164
github.com/go-openapi/analysis v0.21.4 // indirect
166-
github.com/go-openapi/errors v0.20.4 // indirect
167-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
165+
github.com/go-openapi/errors v0.20.3 // indirect
166+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
168167
github.com/go-openapi/jsonreference v0.20.2 // indirect
169168
github.com/go-openapi/loads v0.21.2 // indirect
170169
github.com/go-openapi/runtime v0.26.0 // indirect
171170
github.com/go-openapi/spec v0.20.9 // indirect
172171
github.com/go-openapi/strfmt v0.21.7 // indirect
173-
github.com/go-openapi/swag v0.22.4 // indirect
172+
github.com/go-openapi/swag v0.22.3 // indirect
174173
github.com/go-openapi/validate v0.22.1 // indirect
175174
github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
176175
github.com/go-toolsmith/astcast v1.0.0 // indirect
@@ -198,10 +197,11 @@ require (
198197
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
199198
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
200199
github.com/google/go-cmp v0.6.0 // indirect
201-
github.com/google/go-containerregistry v0.19.0 // indirect
200+
github.com/google/go-containerregistry v0.15.2 // indirect
202201
github.com/google/go-github/v53 v53.2.0 // indirect
203202
github.com/google/go-querystring v1.1.0 // indirect
204-
github.com/google/ko v0.15.1 // indirect
203+
github.com/google/ko v0.14.1 // indirect
204+
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
205205
github.com/google/rpmpack v0.5.0 // indirect
206206
github.com/google/s2a-go v0.1.7 // indirect
207207
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
@@ -253,7 +253,7 @@ require (
253253
github.com/ldez/gomoddirectives v0.2.3 // indirect
254254
github.com/ldez/tagliatelle v0.4.0 // indirect
255255
github.com/leonklingele/grouper v1.1.1 // indirect
256-
github.com/letsencrypt/boulder v0.0.0-20231026200631-000cd05d5491 // indirect
256+
github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect
257257
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
258258
github.com/lufeee/execinquery v1.2.1 // indirect
259259
github.com/magiconair/properties v1.8.7 // indirect
@@ -289,8 +289,9 @@ require (
289289
github.com/nunnatsa/ginkgolinter v0.8.1 // indirect
290290
github.com/oklog/ulid v1.3.1 // indirect
291291
github.com/olekukonko/tablewriter v0.0.5 // indirect
292+
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
292293
github.com/opencontainers/go-digest v1.0.0 // indirect
293-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
294+
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
294295
github.com/pelletier/go-toml v1.9.5 // indirect
295296
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
296297
github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -316,14 +317,13 @@ require (
316317
github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b // indirect
317318
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
318319
github.com/sashamelentyev/usestdlibvars v1.21.1 // indirect
319-
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
320320
github.com/securego/gosec/v2 v2.14.0 // indirect
321321
github.com/sergi/go-diff v1.2.0 // indirect
322322
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
323323
github.com/shopspring/decimal v1.3.1 // indirect
324-
github.com/sigstore/cosign/v2 v2.2.1 // indirect
325-
github.com/sigstore/rekor v1.3.3 // indirect
326-
github.com/sigstore/sigstore v1.7.5 // indirect
324+
github.com/sigstore/cosign/v2 v2.0.3-0.20230523133326-0544abd8fc8a // indirect
325+
github.com/sigstore/rekor v1.2.0 // indirect
326+
github.com/sigstore/sigstore v1.6.4 // indirect
327327
github.com/sirupsen/logrus v1.9.3 // indirect
328328
github.com/sivchari/containedctx v1.0.2 // indirect
329329
github.com/sivchari/nosnakecase v1.7.0 // indirect
@@ -338,7 +338,6 @@ require (
338338
github.com/spf13/cobra v1.8.0 // indirect
339339
github.com/spf13/pflag v1.0.5 // indirect
340340
github.com/spf13/viper v1.17.0 // indirect
341-
github.com/src-d/gcfg v1.4.0 // indirect
342341
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
343342
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
344343
github.com/stretchr/objx v0.5.0 // indirect
@@ -347,6 +346,7 @@ require (
347346
github.com/tdakkota/asciicheck v0.1.1 // indirect
348347
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
349348
github.com/tetafro/godot v1.4.11 // indirect
349+
github.com/theupdateframework/go-tuf v0.5.2 // indirect
350350
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect
351351
github.com/timonwong/loggercheck v0.9.3 // indirect
352352
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
@@ -360,7 +360,7 @@ require (
360360
github.com/ultraware/whitespace v0.0.5 // indirect
361361
github.com/urfave/cli/v2 v2.27.1 // indirect
362362
github.com/uudashr/gocognit v1.0.6 // indirect
363-
github.com/vbatts/tar-split v0.11.5 // indirect
363+
github.com/vbatts/tar-split v0.11.3 // indirect
364364
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 // indirect
365365
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
366366
github.com/xanzy/go-gitlab v0.97.0 // indirect
@@ -371,21 +371,22 @@ require (
371371
github.com/yuin/goldmark v1.7.0 // indirect
372372
gitlab.com/bosi/decorder v0.2.3 // indirect
373373
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
374-
go.mongodb.org/mongo-driver v1.12.1 // indirect
374+
go.mongodb.org/mongo-driver v1.11.3 // indirect
375375
go.opencensus.io v0.24.0 // indirect
376-
go.uber.org/automaxprocs v1.5.3 // indirect
376+
go.uber.org/automaxprocs v1.5.2 // indirect
377+
go.uber.org/goleak v1.3.0 // indirect
377378
go.uber.org/multierr v1.11.0 // indirect
378379
go.uber.org/zap v1.26.0 // indirect
379380
gocloud.dev v0.36.0 // indirect
380-
golang.org/x/crypto v0.19.0 // indirect
381+
golang.org/x/crypto v0.21.0 // indirect
381382
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
382383
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
383384
golang.org/x/mod v0.15.0 // indirect
384385
golang.org/x/net v0.21.0 // indirect
385386
golang.org/x/oauth2 v0.16.0 // indirect
386387
golang.org/x/sync v0.6.0 // indirect
387-
golang.org/x/sys v0.17.0 // indirect
388-
golang.org/x/term v0.17.0 // indirect
388+
golang.org/x/sys v0.18.0 // indirect
389+
golang.org/x/term v0.18.0 // indirect
389390
golang.org/x/text v0.14.0 // indirect
390391
golang.org/x/time v0.4.0 // indirect
391392
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
@@ -395,14 +396,11 @@ require (
395396
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
396397
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
397398
google.golang.org/grpc v1.59.0 // indirect
398-
google.golang.org/protobuf v1.31.0 // indirect
399-
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
399+
google.golang.org/protobuf v1.33.0 // indirect
400400
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
401-
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
402401
gopkg.in/ini.v1 v1.67.0 // indirect
403402
gopkg.in/mail.v2 v2.3.1 // indirect
404-
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
405-
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
403+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
406404
gopkg.in/warnings.v0 v0.1.2 // indirect
407405
gopkg.in/yaml.v2 v2.4.0 // indirect
408406
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -412,5 +410,5 @@ require (
412410
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
413411
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
414412
sigs.k8s.io/kind v0.20.0 // indirect
415-
sigs.k8s.io/yaml v1.4.0 // indirect
413+
sigs.k8s.io/yaml v1.3.0 // indirect
416414
)

0 commit comments

Comments
 (0)