forked from cerc-io/plugeth
Merge pull request #3560 from karalabe/ci-misspell
travis, appveyor, build: add source spell checking
This commit is contained in:
commit
b5a100b859
@ -90,7 +90,7 @@ install:
|
|||||||
- go get golang.org/x/tools/cmd/cover
|
- go get golang.org/x/tools/cmd/cover
|
||||||
script:
|
script:
|
||||||
- go run build/ci.go install
|
- go run build/ci.go install
|
||||||
- go run build/ci.go test -coverage -vet
|
- go run build/ci.go test -coverage -vet -misspell
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
webhooks:
|
webhooks:
|
||||||
|
@ -91,7 +91,7 @@ func NewType(t string) (typ Type, err error) {
|
|||||||
}
|
}
|
||||||
typ.Elem = &sliceType
|
typ.Elem = &sliceType
|
||||||
typ.stringKind = sliceType.stringKind + t[len(res[1]):]
|
typ.stringKind = sliceType.stringKind + t[len(res[1]):]
|
||||||
// Altough we know that this is an array, we cannot return
|
// Although we know that this is an array, we cannot return
|
||||||
// as we don't know the type of the element, however, if it
|
// as we don't know the type of the element, however, if it
|
||||||
// is still an array, then don't determine the type.
|
// is still an array, then don't determine the type.
|
||||||
if typ.Elem.IsArray || typ.Elem.IsSlice {
|
if typ.Elem.IsArray || typ.Elem.IsSlice {
|
||||||
|
35
build/ci.go
35
build/ci.go
@ -24,7 +24,7 @@ Usage: go run ci.go <command> <command flags/arguments>
|
|||||||
Available commands are:
|
Available commands are:
|
||||||
|
|
||||||
install [-arch architecture] [ packages... ] -- builds packages and executables
|
install [-arch architecture] [ packages... ] -- builds packages and executables
|
||||||
test [ -coverage ] [ -vet ] [ packages... ] -- runs the tests
|
test [ -coverage ] [ -vet ] [ -misspell ] [ packages... ] -- runs the tests
|
||||||
archive [-arch architecture] [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts
|
archive [-arch architecture] [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts
|
||||||
importkeys -- imports signing keys from env
|
importkeys -- imports signing keys from env
|
||||||
debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package
|
debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package
|
||||||
@ -262,6 +262,7 @@ func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
|
|||||||
func doTest(cmdline []string) {
|
func doTest(cmdline []string) {
|
||||||
var (
|
var (
|
||||||
vet = flag.Bool("vet", false, "Whether to run go vet")
|
vet = flag.Bool("vet", false, "Whether to run go vet")
|
||||||
|
misspell = flag.Bool("misspell", false, "Whether to run the spell checker")
|
||||||
coverage = flag.Bool("coverage", false, "Whether to record code coverage")
|
coverage = flag.Bool("coverage", false, "Whether to record code coverage")
|
||||||
)
|
)
|
||||||
flag.CommandLine.Parse(cmdline)
|
flag.CommandLine.Parse(cmdline)
|
||||||
@ -287,7 +288,9 @@ func doTest(cmdline []string) {
|
|||||||
if *vet {
|
if *vet {
|
||||||
build.MustRun(goTool("vet", packages...))
|
build.MustRun(goTool("vet", packages...))
|
||||||
}
|
}
|
||||||
|
if *misspell {
|
||||||
|
spellcheck(packages)
|
||||||
|
}
|
||||||
// Run the actual tests.
|
// Run the actual tests.
|
||||||
gotest := goTool("test")
|
gotest := goTool("test")
|
||||||
// Test a single package at a time. CI builders are slow
|
// Test a single package at a time. CI builders are slow
|
||||||
@ -300,6 +303,34 @@ func doTest(cmdline []string) {
|
|||||||
build.MustRun(gotest)
|
build.MustRun(gotest)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// spellcheck runs the client9/misspell spellchecker package on all Go, Cgo and
|
||||||
|
// test files in the requested packages.
|
||||||
|
func spellcheck(packages []string) {
|
||||||
|
// Ensure the spellchecker is available
|
||||||
|
build.MustRun(goTool("get", "github.com/client9/misspell/cmd/misspell"))
|
||||||
|
|
||||||
|
// Windows chokes on long argument lists, check packages individualy
|
||||||
|
for _, pkg := range packages {
|
||||||
|
// The spell checker doesn't work on packages, gather all .go files for it
|
||||||
|
out, err := goTool("list", "-f", "{{.Dir}}{{range .GoFiles}}\n{{.}}{{end}}{{range .CgoFiles}}\n{{.}}{{end}}{{range .TestGoFiles}}\n{{.}}{{end}}", pkg).CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("source file listing failed: %v\n%s", err, string(out))
|
||||||
|
}
|
||||||
|
// Retrieve the folder and assemble the source list
|
||||||
|
lines := strings.Split(string(out), "\n")
|
||||||
|
root := lines[0]
|
||||||
|
|
||||||
|
sources := make([]string, 0, len(lines)-1)
|
||||||
|
for _, line := range lines[1:] {
|
||||||
|
if line = strings.TrimSpace(line); line != "" {
|
||||||
|
sources = append(sources, filepath.Join(root, line))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Run the spell checker for this particular package
|
||||||
|
build.MustRunCommand(filepath.Join(GOBIN, "misspell"), append([]string{"-error"}, sources...)...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Release Packaging
|
// Release Packaging
|
||||||
|
|
||||||
func doArchive(cmdline []string) {
|
func doArchive(cmdline []string) {
|
||||||
|
Loading…
Reference in New Issue
Block a user