.travis.yml and don't use internal package

golangci · May 13, 2018 · 5c2e6e9 · 5c2e6e9
1 parent 0e107e1
commit 5c2e6e9
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+sudo: false
+language: go
+go:
+  - 1.9.x
+  - 1.10.x
+script: make test
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
 test:
+	go install ./cmd/...
 	golangci-lint run
 	go test -v -race ./...
diff --git a/cmd/golangci-lint/main.go b/cmd/golangci-lint/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/golangci/golangci-lint/internal/commands"
+	"github.com/golangci/golangci-lint/pkg/commands"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/internal/commands/executor.go → pkg/commands/executor.go b/internal/commands/executor.go → pkg/commands/executor.go
diff --git a/internal/commands/linters.go → pkg/commands/linters.go b/internal/commands/linters.go → pkg/commands/linters.go
diff --git a/internal/commands/root.go → pkg/commands/root.go b/internal/commands/root.go → pkg/commands/root.go
diff --git a/internal/commands/run.go → pkg/commands/run.go b/internal/commands/run.go → pkg/commands/run.go
diff --git a/pkg/testdata/with_issues/deadcode.go b/pkg/testdata/with_issues/deadcode.go
@@ -2,12 +2,12 @@ package testdata
 
 var y int
 
-var unused int // ERROR "`unused` is unused"
+var unused int // nolint:megacheck // ERROR "`unused` is unused"
 
 func f(x int) {
 }
 
-func g(x int) { // ERROR "`g` is unused"
+func g(x int) { // nolint:megacheck // ERROR "`g` is unused"
 }
 
 func H(x int) {

diff --git a/pkg/testdata/with_issues/structcheck.go b/pkg/testdata/with_issues/structcheck.go
@@ -1,5 +1,5 @@
 package testdata
 
-type t struct { // ERROR "`t` is unused"
-	unusedField int // ERROR "`unusedField` is unused"
+type t struct { // nolint:megacheck // ERROR "`t` is unused"
+	unusedField int // nolint:megacheck // ERROR "`unusedField` is unused"
 }
diff --git a/pkg/testdata/with_issues/varcheck.go b/pkg/testdata/with_issues/varcheck.go
@@ -1,3 +1,3 @@
 package testdata
 
-var v string // ERROR "`v` is unused"
+var v string // nolint:megacheck // ERROR "`v` is unused"