diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-14 17:35:49 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-14 17:36:12 +0800 |
| commit | 47a801455966298d1d1519eebb955024c8f02b84 (patch) | |
| tree | 5b8144ba4844092dc0bae599fc3314eaacf1a7b4 /build | |
| parent | 19982f946735948478b6b7e7706f1b615f171d0d (diff) | |
| parent | 3654aeaa4f87452ac5bc801a18808189595e2ef8 (diff) | |
| download | dexon-47a801455966298d1d1519eebb955024c8f02b84.tar dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.gz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.bz2 dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.lz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.xz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.zst dexon-47a801455966298d1d1519eebb955024c8f02b84.zip | |
cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Fix a conflict in cmd/swarm envVarsOverride function.
Diffstat (limited to 'build')
| -rw-r--r-- | build/ci.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/ci.go b/build/ci.go index ede543d90..987f0bb18 100644 --- a/build/ci.go +++ b/build/ci.go @@ -319,8 +319,8 @@ func doLint(cmdline []string) { packages = flag.CommandLine.Args() } // Get metalinter and install all supported linters - build.MustRun(goTool("get", "gopkg.in/alecthomas/gometalinter.v1")) - build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v1"), "--install") + build.MustRun(goTool("get", "gopkg.in/alecthomas/gometalinter.v2")) + build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v2"), "--install") // Run fast linters batched together configs := []string{ @@ -332,12 +332,12 @@ func doLint(cmdline []string) { "--enable=goconst", "--min-occurrences=6", // for goconst } - build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v1"), append(configs, packages...)...) + build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v2"), append(configs, packages...)...) // Run slow linters one by one 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...)...) + build.MustRunCommand(filepath.Join(GOBIN, "gometalinter.v2"), append(configs, packages...)...) } } |