Merge pull request #19 from moznion/use_golangci-lint

Use golanglint-ci instead of golint
moznion · Aug 23, 2022 · d005659 · d005659
2 parents 3e691f0 + aeac609
commit d005659
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -18,7 +18,10 @@ jobs:
     - name: Install go toolchains
       run: |
         go install golang.org/x/tools/cmd/goimports@latest
-        go install golang.org/x/lint/golint@latest
     - name: Do test
-      run: make check
+      run: make check-ci
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v3
+      with:
+        version: latest
 
diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@ REVISION=$(shell git rev-parse --verify HEAD)
 INTERNAL_PACKAGE=github.com/moznion/gonstructor/internal
 
 check: test lint vet fmt-check
+check-ci: test vet fmt-check
 
 build4test: clean
 	mkdir -p $(RELEASE_DIR)
@@ -18,7 +19,8 @@ test: gen4test
 	go test -v $(PKGS)
 
 lint:
-	golint -set_exit_status $(PKGS_WITHOUT_TEST)
+lint:
+	golangci-lint run ./...
 
 vet:
 	go vet $(PKGS)

diff --git a/internal/test/init_return_propagation/structure.go b/internal/test/init_return_propagation/structure.go
@@ -31,7 +31,6 @@ func (s *StructureWithInitFoo) initialize() {
 }
 
 func (s StructureWithInitBar) initializeWithActualValueReceiver() {
-	s.checked = true
 }
 
 func (s *StructureWithInitBuz) initializeWithError() error {

diff --git a/internal/test/structure_test.go b/internal/test/structure_test.go
@@ -10,7 +10,7 @@ import (
 func TestStructureAllArgsConstructor(t *testing.T) {
 	givenString := "givenstr"
 	givenIOReader := strings.NewReader(givenString)
-	givenChan := make(chan interface{}, 0)
+	givenChan := make(chan interface{})
 
 	got := NewStructure(givenString, givenIOReader, givenChan)
 	assert.IsType(t, &Structure{}, got)
@@ -30,7 +30,7 @@ func TestStructureAllArgsConstructor(t *testing.T) {
 func TestStructureBuilder(t *testing.T) {
 	givenString := "givenstr"
 	givenIOReader := strings.NewReader(givenString)
-	givenChan := make(chan interface{}, 0)
+	givenChan := make(chan interface{})
 
 	b := NewStructureBuilder()
 	got := b.Foo(givenString).
@@ -46,7 +46,7 @@ func TestStructureBuilder(t *testing.T) {
 }
 
 func TestChildStructureAllArgsConstructor(t *testing.T) {
-	structure := NewStructure("givenstr", strings.NewReader("givenstr"), make(chan interface{}, 0))
+	structure := NewStructure("givenstr", strings.NewReader("givenstr"), make(chan interface{}))
 	givenString := "foobar"
 
 	got := NewChildStructure(structure, givenString)