Skip to content

Commit

Permalink
Merge pull request #17 from Comcast/feature/strip_vendor
Browse files Browse the repository at this point in the history
Feature/strip vendor
  • Loading branch information
schmidtw authored Aug 30, 2017
2 parents 94a3ebc + 0ed2a3b commit 41fc7dd
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha
```
yum install https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/talaria-0.0.1-65.el6.x86_64.rpm
```

13 changes: 7 additions & 6 deletions src/glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package: .
homepage: https://github.com/Comcast/talaria
import:
- package: github.com/Comcast/webpa-common
version: 8c3337c32f98e4b38fea36b1d3c2dd03d7f95cd4
version: 4748c84a43400ca47e78796759c2da55b097dc08
subpackages:
- device
- logging
Expand Down
2 changes: 1 addition & 1 deletion talaria.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 41fc7dd

Please sign in to comment.