From 0c72649afc0636e22196263c7d83254d1e8aed4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A6=E6=AF=85?= Date: Mon, 16 Oct 2017 17:55:32 +0800 Subject: [PATCH] Fix gometalinter versioning (#4832) * fix gometalinter versioning * stop gometalinter --- .pre-commit-config.yaml | 3 --- go/glide.lock | 14 +++++++++----- go/glide.yaml | 2 ++ paddle/scripts/travis/check_style.sh | 13 ++++++++----- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 83fe9af7689..59661c9c1da 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,6 +31,3 @@ - id: go-fmt types: - go - - id: gometalinter - types: - - go diff --git a/go/glide.lock b/go/glide.lock index 1ecdd217520..aabc03657ff 100644 --- a/go/glide.lock +++ b/go/glide.lock @@ -1,6 +1,8 @@ -hash: 1b9b07408ca7fac27a374dc2ccd2433e4bff090484008a037df967284949a582 -updated: 2017-08-07T23:37:48.867469328Z +hash: 328e7b9b7306b45e7b9879139a9f86698115981f6283032e1312093a6a6ddb04 +updated: 2017-10-16T08:00:23.484693528Z imports: +- name: github.com/alecthomas/gometalinter + version: bae2f1293d092fd8167939d5108d1b025eaef9de - name: github.com/beorn7/perks version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 subpackages: @@ -10,7 +12,7 @@ imports: - name: github.com/cockroachdb/cmux version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92 - name: github.com/coreos/etcd - version: d0d1a87aa96ae14914751d42264262cb69eda170 + version: f1d7dd87da3e8feab4aaf675b8e29c6a5ed5f58b subpackages: - alarm - auth @@ -149,7 +151,7 @@ imports: - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/sirupsen/logrus - version: a3f95b5c423586578a4e099b11a46c2479628cac + version: f006c2ac4710855cf0f916dd6b77acf6b048dc6e - name: github.com/topicai/candy version: 1b9030d056fa9f8c4b1f9c91b52fe4b8ab4cd8cc - name: github.com/ugorji/go @@ -159,12 +161,13 @@ imports: - name: github.com/xiang90/probing version: 07dd2e8dfe18522e9c447ba95f2fe95262f63bb2 - name: golang.org/x/crypto - version: 1351f936d976c60a0a48d728281922cf63eafb8d + version: 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 repo: https://github.com/golang/crypto.git vcs: git subpackages: - bcrypt - blowfish + - ssh/terminal - name: golang.org/x/net version: c8c74377599bd978aee1cf3b9b63a8634051cec2 subpackages: @@ -219,3 +222,4 @@ testImports: version: 05e8a0eda380579888eb53c394909df027f06991 subpackages: - assert + diff --git a/go/glide.yaml b/go/glide.yaml index a90e71b615d..4b22ab2caaa 100644 --- a/go/glide.yaml +++ b/go/glide.yaml @@ -24,3 +24,5 @@ import: vcs: git - package: github.com/satori/go.uuid version: v1.1.0 +- package: github.com/alecthomas/gometalinter + version: v1.2.1 diff --git a/paddle/scripts/travis/check_style.sh b/paddle/scripts/travis/check_style.sh index cb483b0ffc0..e71d243efa2 100755 --- a/paddle/scripts/travis/check_style.sh +++ b/paddle/scripts/travis/check_style.sh @@ -11,7 +11,13 @@ set -e # install glide curl https://glide.sh/get | bash eval "$(GIMME_GO_VERSION=1.8.3 gimme)" -go get -u github.com/alecthomas/gometalinter + +# set up go environment for running gometalinter +mkdir -p $GOPATH/src/github.com/PaddlePaddle/ +ln -sf $TRAVIS_BUILD_DIR $GOPATH/src/github.com/PaddlePaddle/Paddle +cd $GOPATH/src/github.com/PaddlePaddle/Paddle/go; glide install; cd - + +go get github.com/alecthomas/gometalinter gometalinter --install cd $TRAVIS_BUILD_DIR @@ -19,10 +25,7 @@ export PATH=/usr/bin:$PATH pre-commit install clang-format --version -# set up go environment for running gometalinter -mkdir -p $GOPATH/src/github.com/PaddlePaddle/ -ln -sf $TRAVIS_BUILD_DIR $GOPATH/src/github.com/PaddlePaddle/Paddle -cd $GOPATH/src/github.com/PaddlePaddle/Paddle/go; glide install; cd - + if ! pre-commit run -a ; then git diff -- GitLab