From cdee4f67a024717b5e7e776eefb2c950a9bd03c7 Mon Sep 17 00:00:00 2001 From: tkc <181991+tkc@users.noreply.github.com> Date: Mon, 9 Mar 2020 20:34:12 +0900 Subject: [PATCH 1/5] Add scopelint --- .github/workflows/go.yml | 2 ++ go.mod | 4 ++++ go.sum | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7317d40..2728c3a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -23,5 +23,7 @@ jobs: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure fi + - name: Lint + run: scopelint ./... - name: Build run: go build -v . \ No newline at end of file diff --git a/go.mod b/go.mod index 408d4e3..bc8a07c 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,10 @@ module github.com/tkc/go-json-server go 1.13 require ( + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect + github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect + github.com/kyoh86/scopelint v0.2.0 // indirect github.com/spf13/cast v1.3.1 github.com/stretchr/testify v1.5.1 + gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect ) diff --git a/go.sum b/go.sum index fbc6894..e2dabad 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,36 @@ +github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= +github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= +github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/kyoh86/scopelint v0.2.0 h1:suOCh1T05nIY8srcI266aqwf3RLtO8kniZOTaAnzRyg= +github.com/kyoh86/scopelint v0.2.0/go.mod h1:veFgnmDG8sPR5nFaXGX2mEIOXKHjWpGo79v/NaiTcRE= +github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= 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/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +gopkg.in/alecthomas/kingpin.v2 v2.2.5 h1:qskSCq465uEvC3oGocwvZNsO3RF3SpLVLumOAhL0bXo= +gopkg.in/alecthomas/kingpin.v2 v2.2.5/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 2d49d93f832b045a02b1d6bab5e086ad1eddc74d Mon Sep 17 00:00:00 2001 From: tkc <181991+tkc@users.noreply.github.com> Date: Mon, 9 Mar 2020 20:34:48 +0900 Subject: [PATCH 2/5] Tiny fix --- .github/workflows/go.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2728c3a..90599a7 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -6,16 +6,13 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up Go 1.13 uses: actions/setup-go@v1 with: go-version: 1.13 id: go - - name: Check out code into the Go module directory uses: actions/checkout@v2 - - name: Get dependencies run: | go get -v -t -d ./... @@ -24,6 +21,6 @@ jobs: dep ensure fi - name: Lint - run: scopelint ./... + run: scopelint ./... - name: Build run: go build -v . \ No newline at end of file From 0c83fdf54559c853286094f1e3e3abdf43ecf339 Mon Sep 17 00:00:00 2001 From: tkc <181991+tkc@users.noreply.github.com> Date: Mon, 9 Mar 2020 20:51:02 +0900 Subject: [PATCH 3/5] Update action yml --- .github/workflows/go.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 90599a7..c05e730 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,7 +1,8 @@ name: Go + on: [push] -jobs: +jobs: build: name: Build runs-on: ubuntu-latest @@ -15,12 +16,16 @@ jobs: uses: actions/checkout@v2 - name: Get dependencies run: | - go get -v -t -d ./... - if [ -f Gopkg.toml ]; then - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh - dep ensure - fi + export GO111MODULE=on + go mod download - name: Lint - run: scopelint ./... + run: | + scopelint ./... + - name: fmt + run: go fmt ./... + - name: vet + run: go vet ./... - name: Build - run: go build -v . \ No newline at end of file + run: go build -v . + + \ No newline at end of file From 7c39c486a40b3d0da79373315c4e4abb92651083 Mon Sep 17 00:00:00 2001 From: tkc <181991+tkc@users.noreply.github.com> Date: Mon, 9 Mar 2020 20:52:38 +0900 Subject: [PATCH 4/5] Update action yml --- .github/workflows/go.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c05e730..93506b5 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -18,6 +18,7 @@ jobs: run: | export GO111MODULE=on go mod download + go get -u github.com/kyoh86/scopelint - name: Lint run: | scopelint ./... @@ -27,5 +28,3 @@ jobs: run: go vet ./... - name: Build run: go build -v . - - \ No newline at end of file From a9880c81cc2787524a7b4276b7dbafa557601803 Mon Sep 17 00:00:00 2001 From: tkc <181991+tkc@users.noreply.github.com> Date: Mon, 9 Mar 2020 20:56:18 +0900 Subject: [PATCH 5/5] Update action yml --- .github/workflows/go.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 93506b5..6906cee 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -19,9 +19,9 @@ jobs: export GO111MODULE=on go mod download go get -u github.com/kyoh86/scopelint - - name: Lint - run: | - scopelint ./... + # - name: Lint + # run: | + # scopelint ./... - name: fmt run: go fmt ./... - name: vet