ci: run goimports on our code and ensure it remains well formatted (#628

)
govim · Dec 17, 2019 · 6240503 · 6240503
1 parent 98f3216
commit 6240503
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/_scripts/dockerRun.sh b/_scripts/dockerRun.sh
@@ -50,6 +50,6 @@ go run honnef.co/go/tools/cmd/staticcheck $(go list ./... | grep -v 'govim/inter
 if [ "${CI:-}" == "true" && "${TRAVIS_EVENT_TYPE:-}" != "cron" ]
 then
 	go mod tidy
-	diff <(echo -n) <(gofmt -d $(git ls-files '**/*.go' '*.go' | grep -v cmd/govim/internal/golang_org_x_tools))
+	diff <(echo -n) <(go run golang.org/x/tools/cmd/goimports -d $(git ls-files '**/*.go' '*.go' | grep -v golang_org_x_tools))
 	test -z "$(git status --porcelain)" || (git status; git diff; false)
 fi
diff --git a/cmd/govim/main_test.go b/cmd/govim/main_test.go
@@ -18,10 +18,10 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/creack/pty"
 	"github.com/govim/govim/cmd/govim/config"
 	"github.com/govim/govim/testdriver"
 	"github.com/govim/govim/testsetup"
-	"github.com/creack/pty"
 	"github.com/rogpeppe/go-internal/goproxytest"
 	"github.com/rogpeppe/go-internal/testscript"
 )

diff --git a/testdriver/testdriver.go b/testdriver/testdriver.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/acarl005/stripansi"
 
+	"github.com/creack/pty"
 	"github.com/govim/govim"
 	"github.com/govim/govim/testsetup"
-	"github.com/creack/pty"
 	"github.com/rogpeppe/go-internal/semver"
 	"github.com/rogpeppe/go-internal/testscript"
 	"gopkg.in/retry.v1"