Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit 2bc5c06

Browse files
sio4sio4
authored
Merge pull request #11 from gobuffalo/dependency-update
process: updated dependencies and go version (1.17)
2 parents 6d7b85d + 4c36a72 commit 2bc5c06

File tree

6 files changed

+66
-69
lines changed

6 files changed

+66
-69
lines changed

‎.gometalinter.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Makefile‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
1-
TAGS ?= "sqlite"
2-
GO_BIN ?= go
1+
TAGS ?= sqlite,integration
2+
GO_BIN ?= go
33

4-
install:
5-
packr2
6-
$(GO_BIN) install -v .
4+
LINT_TARGET ?= ./...
5+
LINT_SKIP_DIRS ?= "internal"
76

8-
deps:
9-
$(GO_BIN) get github.com/gobuffalo/release
10-
$(GO_BIN) get github.com/gobuffalo/packr/v2
11-
$(GO_BIN) get -tags ${TAGS} -t ./...
12-
$(GO_BIN) mod tidy
7+
LINTERS_B = govet,revive,goimports,unused,typecheck,ineffassign,misspell,nakedret,unconvert,megacheck
8+
LINTERS = $(LINTERS_B),gocognit,gocyclo,misspell
9+
MORE_LINTERS = $(LINTERS),errorlint,goerr113,forcetypeassert,gosec
1310

14-
build:
15-
packr2
16-
$(GO_BIN) build -v .
11+
DEPRECATED_LINTERS = deadcode,golint,maligned,ifshort,scopelint,interfacer,varcheck,nosnakecase,structcheck
12+
NEVER_LINTERS = godox,forbidigo,varnamelen,paralleltest,testpackage
13+
DISABLED_LINTERS = $(DEPRECATED_LINTERS),$(NEVER_LINTERS),exhaustivestruct,ireturn,gci,gochecknoglobals,wrapcheck
14+
DISABLED_LINTERS_TEST = $(DISABLED_LINTERS),nolintlint,wsl,goerr113,forcetypeassert,errcheck,goconst,scopelint
1715

1816
test:
19-
packr2
20-
$(GO_BIN) test -tags ${TAGS} ./...
21-
22-
ci-test: deps
23-
$(GO_BIN) test -tags ${TAGS} -race ./...
17+
$(GO_BIN) test -tags ${TAGS} -cover -race ./...
2418

2519
lint:
26-
gometalinter --vendor ./... --deadline=1m --skip=internal
27-
28-
update:
29-
$(GO_BIN) get -u -tags ${TAGS}
30-
$(GO_BIN) mod tidy
31-
packr2
32-
make test
33-
make install
34-
$(GO_BIN) mod tidy
35-
36-
release-test:
37-
$(GO_BIN) test -tags ${TAGS} -race ./...
20+
# go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
21+
golangci-lint run --disable-all --enable $(LINTERS) \
22+
--skip-dirs $(LINT_SKIP_DIRS) \
23+
$(LINT_TARGET)
24+
golangci-lint run --disable-all --enable $(MORE_LINTERS) \
25+
--skip-dirs $(LINT_SKIP_DIRS) \
26+
--tests=false $(LINT_TARGET)
27+
28+
lint-harder:
29+
golangci-lint run --enable-all --disable $(DISABLED_LINTERS) \
30+
--skip-dirs $(LINT_SKIP_DIRS) \
31+
--exclude-use-default=false \
32+
--tests=false $(LINT_TARGET)
33+
golangci-lint run --enable-all --disable $(DISABLED_LINTERS_TEST) \
34+
--skip-dirs $(LINT_SKIP_DIRS) \
35+
--exclude-use-default=false \
36+
$(LINT_TARGET)
3837

39-
release:
40-
release -y -f version.go

‎go.mod‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/gobuffalo/github_flavored_markdown
22

3-
go 1.16
3+
go 1.17
44

55
exclude (
66
// https://github.com/advisories/GHSA-wxc4-f4m6-wwqv
@@ -9,10 +9,14 @@ exclude (
99
)
1010

1111
require (
12-
github.com/microcosm-cc/bluemonday v1.0.20
13-
github.com/sergi/go-diff v1.2.0
12+
github.com/microcosm-cc/bluemonday v1.0.22
13+
github.com/sergi/go-diff v1.3.1
1414
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d
1515
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e
16-
golang.org/x/net v0.0.0-20221002022538-bcab6841153b
17-
gopkg.in/yaml.v2 v2.4.0 // indirect
16+
golang.org/x/net v0.7.0
17+
)
18+
19+
require (
20+
github.com/aymerick/douceur v0.2.0 // indirect
21+
github.com/gorilla/css v1.0.0 // indirect
1822
)

‎go.sum‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,49 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
1010
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
1111
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
1212
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
13-
github.com/microcosm-cc/bluemonday v1.0.20 h1:flpzsq4KU3QIYAYGV/szUat7H+GPOXR0B2JU5A1Wp8Y=
14-
github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50=
13+
github.com/microcosm-cc/bluemonday v1.0.22 h1:p2tT7RNzRdCi0qmwxG+HbqD6ILkmwter1ZwVZn1oTxA=
14+
github.com/microcosm-cc/bluemonday v1.0.22/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
1515
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1616
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
17-
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
18-
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
17+
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
18+
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
1919
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d h1:yKm7XZV6j9Ev6lojP2XaIshpT4ymkqhMeSghO5Ps00E=
2020
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
2121
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG93cPwA5f7s/ZPBJnGOYQNK/vKsaDaseuKT5Asee8=
2222
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
2323
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2424
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
2525
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
26-
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
27-
golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU=
26+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
27+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
28+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
29+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
30+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
31+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
32+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
2833
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
34+
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
35+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
36+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
37+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
38+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
39+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2940
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
41+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
42+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3043
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
44+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
45+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
3146
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
47+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
48+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
49+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
3250
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
51+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
3352
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
53+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
54+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
55+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3456
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3557
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3658
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

‎shoulders.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎version.go‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)