Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
Migrate from glide to dep for dependency management (#1670)
Browse files Browse the repository at this point in the history
* dep init

* Resolve conflict for code.cloudfoundry.org/lager
  code.cloudfoundry.org/lager is required to be at 0bfa98e by
  github.com/pivotal-cf/brokerapi
  https://github.com/pivotal-cf/brokerapi/blob/35946a0079bda144d0c9ed68df36899451f90209/Gopkg.toml#L26

* Require code generators and build tools
  I had to change the constraint for repo-infra from a pinned revision
  to latest on master. I was running into dependency hell otherwise. Can revisit if
  necessary.

* Sync vendor to Gopkg.lock

* Ignoring large doc files in GoLLRB

* Validate vendor and dep config during build

* Add test-dep target
  Validates that a downstream consumer of our client library can use dep
* Add verify-vendor target
  Validates that what is in vendor/ is in sync with Gopkg.lock
* Install dep in the docker build image

* Update relevant glide usage to dep

We cannot completely remove glide because we are using
`glide nv`. If we had a requirement of Go 1.9+ maybe that could
be dropped, since the go tools in that version don't include
vendor anymore with `./...`, but until then it needs to stay.

* Remove glide config files in favor of dep's

* Skip dep's cache during href checking

* Remove native dep targets

They don't work because GOPATH is redefined in the Makefile
So people will just have to rely on the docker, or install dep themselves.
  • Loading branch information
carolynvs authored and arschles committed Jan 25, 2018
1 parent 1cf0dd9 commit 1c45aef
Show file tree
Hide file tree
Showing 185 changed files with 19,863 additions and 1,269 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ bin/**
coverage.html
.idea/
.DS_Store
.glide
.scBuildImage
.init
.generate*
Expand All @@ -21,3 +20,7 @@ contrib/build/*/tmp/*
.kube
.var
.vscode
vendor/github.com/petar/GoLLRB/doc/*
contrib/examples/consumer/Gopkg.lock
contrib/examples/consumer
contrib/examples/vendor/*
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
cache:
directories:
- .glide
- $GOPATH/pkg/dep
script:
- make verify build build-integration build-e2e test images svcat
deploy:
Expand Down
Loading

0 comments on commit 1c45aef

Please sign in to comment.