diff --git a/Makefile b/Makefile index 81f5ee0..759c874 100755 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ install: go install github.com/osspkg/devtool@latest +.PHONY: setup +setup: + devtool setup-lib .PHONY: lint lint: @@ -12,12 +15,16 @@ lint: license: devtool license +.PHONY: build +build: + devtool build --arch=amd64 + .PHONY: tests tests: devtool test .PHONY: ci -ci: install license lint tests +ci: install setup license lint build tests .PHONY: go_work go_work: diff --git a/algorithms/go.mod b/algorithms/go.mod index e43da5e..54f9307 100644 --- a/algorithms/go.mod +++ b/algorithms/go.mod @@ -3,3 +3,5 @@ module go.osspkg.com/x/algorithms go 1.20 replace go.osspkg.com/x/test => ./../test + +require go.osspkg.com/x/test v0.5.0 diff --git a/algorithms/go.sum b/algorithms/go.sum index 60ce688..e69de29 100644 --- a/algorithms/go.sum +++ b/algorithms/go.sum @@ -1,10 +0,0 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/app/go.mod b/app/go.mod index f159aec..3a27604 100644 --- a/app/go.mod +++ b/app/go.mod @@ -16,12 +16,12 @@ replace ( ) require ( - go.osspkg.com/x/algorithms v0.5.0 + go.osspkg.com/x/algorithms v0.5.1 go.osspkg.com/x/config v0.5.1 go.osspkg.com/x/console v0.5.1 go.osspkg.com/x/env v0.5.0 go.osspkg.com/x/errors v0.5.0 - go.osspkg.com/x/logx v0.5.2 + go.osspkg.com/x/logx v0.5.3 go.osspkg.com/x/syncing v0.5.1 go.osspkg.com/x/syscall v0.5.0 go.osspkg.com/x/test v0.5.0 diff --git a/logx/message_easyjson.go b/logx/message_easyjson.go index 969f5bf..1942a32 100644 --- a/logx/message_easyjson.go +++ b/logx/message_easyjson.go @@ -17,7 +17,7 @@ var ( _ easyjson.Marshaler ) -func easyjson4086215fDecodeGoOsspkgComGoppyXlog(in *jlexer.Lexer, out *Message) { +func easyjson4086215fDecodeGoOsspkgComXLogx(in *jlexer.Lexer, out *Message) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -78,7 +78,7 @@ func easyjson4086215fDecodeGoOsspkgComGoppyXlog(in *jlexer.Lexer, out *Message) in.Consumed() } } -func easyjson4086215fEncodeGoOsspkgComGoppyXlog(out *jwriter.Writer, in Message) { +func easyjson4086215fEncodeGoOsspkgComXLogx(out *jwriter.Writer, in Message) { out.RawByte('{') first := true _ = first @@ -128,23 +128,23 @@ func easyjson4086215fEncodeGoOsspkgComGoppyXlog(out *jwriter.Writer, in Message) // MarshalJSON supports json.Marshaler interface func (v Message) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson4086215fEncodeGoOsspkgComGoppyXlog(&w, v) + easyjson4086215fEncodeGoOsspkgComXLogx(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v Message) MarshalEasyJSON(w *jwriter.Writer) { - easyjson4086215fEncodeGoOsspkgComGoppyXlog(w, v) + easyjson4086215fEncodeGoOsspkgComXLogx(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *Message) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson4086215fDecodeGoOsspkgComGoppyXlog(&r, v) + easyjson4086215fDecodeGoOsspkgComXLogx(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *Message) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson4086215fDecodeGoOsspkgComGoppyXlog(l, v) + easyjson4086215fDecodeGoOsspkgComXLogx(l, v) }