Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dep wrapper script to ensure consistent version of dep is used #253

Merged
merged 7 commits into from
Feb 2, 2018
Merged

Add dep wrapper script to ensure consistent version of dep is used #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d27677
Add dep wrapper script to ensure consistent version of dep is used
adleong Feb 1, 2018
baa1687
Small fixes
adleong Feb 1, 2018
7b3924a
Update deps shas
adleong Feb 1, 2018
5f50232
Remove dep prune
adleong Feb 1, 2018
91fefe4
Allow running from symlinked directory
adleong Feb 1, 2018
0895661
Resolve merge conflicts
adleong Feb 1, 2018
66f480e
Actually resolve merge conflicts
adleong Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ web/app/node_modules
web/app/dist
.protoc
.gorun
.dep
4 changes: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ jobs:
cache:
directories:
- vendor
before_install:
- go get -u github.com/golang/dep/cmd/dep
install:
- dep ensure
- ./bin/dep ensure
script:
# TODO decide whether protoc should be committed or not. If so, we shouldn't do
# this or we should error if it dirties the repo.
Expand Down
2 changes: 1 addition & 1 deletion BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ bin/go-run controller/script/simulate-proxy --kubeconfig ~/.kube/config --addr $
### Testing

```bash
dep ensure && dep prune
bin/dep ensure
go test ./...
go vet ./...
```
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-go-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

# Fetch `dep` and ensure that all Go dependencies are vendored.
FROM golang:1.9.1 as build
RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.3.1/dep-linux-amd64 && chmod +x /usr/local/bin/dep
RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && chmod +x /usr/local/bin/dep
WORKDIR /go/src/github.com/runconduit/conduit
COPY . .
RUN dep ensure && dep prune
RUN dep ensure

# Preserve dependency sources and build artifacts without maintaining conduit
# sources/artifacts.
Expand Down
Loading