Merge branch 'master' of github.com:Comcast/talaria

xmidt-org · Aug 30, 2017 · 66f50fa · 66f50fa
2 parents 484524f + d12d202
commit 66f50fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
     - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then docker exec build bash -c "pushd codecovio_build; git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge && git checkout -qf FETCH_HEAD; popd"; fi'
 
 script:
-    - docker exec build bash -c "export GOPATH=/codecovio_build && pushd codecovio_build/src && glide install && cd talaria && go build talaria && go test -race -coverprofile=coverage.txt && popd"
+    - docker exec build bash -c "export GOPATH=/codecovio_build && pushd codecovio_build/src && glide install --strip-vendor && cd talaria && go build talaria && go test -race -coverprofile=coverage.txt && popd"
     - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker exec build bash -c "pushd talaria; ./build_rpm.sh; popd"; fi'
 
 after_success:

diff --git a/src/glide.lock b/src/glide.lock
diff --git a/src/glide.yaml b/src/glide.yaml
@@ -2,7 +2,7 @@ package: .
 homepage: https://github.com/Comcast/talaria
 import:
 - package: github.com/Comcast/webpa-common
-  version: 8c3337c32f98e4b38fea36b1d3c2dd03d7f95cd4
+  version: 7696a5eab9625e508963a5a2e9343214060f9718
   subpackages:
   - device
   - logging

diff --git a/talaria.spec b/talaria.spec
@@ -23,7 +23,7 @@ The Xmidt router agent.
 %build
 export GOPATH=$(pwd)
 pushd src
-glide install
+glide install --strip-vendor
 cd talaria
 go build %{name}
 popd