diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-13 17:23:11 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-13 17:40:39 +0800 |
| commit | 19982f946735948478b6b7e7706f1b615f171d0d (patch) | |
| tree | cbacbdb6f9e6e731c2ebc17bad74e875f4d8ea8b /build/ci.go | |
| parent | 1dc19de5da64962a98a37bbc7b93a3895d2eb6e6 (diff) | |
| parent | 32516c768ec09e2a71cab5983d2c8b8ae5d92fc7 (diff) | |
| download | go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.gz go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.bz2 go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.lz go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.xz go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.zst go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Merge with changes that implement config file PR #15548.
Field *EnsApi string* in swarm/api.Config is replaced with
*EnsAPIs []string*.
A new field *EnsDisabled bool* is added to swarm/api.Config for
easy way to disable ENS resolving with config file.
Signature of function swarm.NewSwarm is changed and simplified.
Diffstat (limited to 'build/ci.go')
| -rw-r--r-- | build/ci.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/build/ci.go b/build/ci.go index 0c825ef31..ede543d90 100644 --- a/build/ci.go +++ b/build/ci.go @@ -19,7 +19,7 @@ /* The ci command is called from Continuous Integration scripts. -Usage: go run ci.go <command> <command flags/arguments> +Usage: go run build/ci.go <command> <command flags/arguments> Available commands are: @@ -199,7 +199,7 @@ func doInstall(cmdline []string) { build.MustRun(goinstall) return } - // If we are cross compiling to ARMv5 ARMv6 or ARMv7, clean any prvious builds + // If we are cross compiling to ARMv5 ARMv6 or ARMv7, clean any previous builds if *arch == "arm" { os.RemoveAll(filepath.Join(runtime.GOROOT(), "pkg", runtime.GOOS+"_arm")) for _, path := range filepath.SplitList(build.GOPATH()) { @@ -323,11 +323,19 @@ func doLint(cmdline []string) { build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v1"), "--install") // Run fast linters batched together - configs := []string{"--vendor", "--disable-all", "--enable=vet", "--enable=gofmt", "--enable=misspell"} + configs := []string{ + "--vendor", + "--disable-all", + "--enable=vet", + "--enable=gofmt", + "--enable=misspell", + "--enable=goconst", + "--min-occurrences=6", // for goconst + } build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v1"), append(configs, packages...)...) // Run slow linters one by one - for _, linter := range []string{"unconvert"} { + for _, linter := range []string{"unconvert", "gosimple"} { configs = []string{"--vendor", "--deadline=10m", "--disable-all", "--enable=" + linter} build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v1"), append(configs, packages...)...) } |