Skip to content

Commit

Permalink
remove references to govendor and vendorfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
magiconair committed Aug 16, 2018
1 parent 58502ca commit 58c9ff2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
20 changes: 2 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ GOVERSION = $(shell go version | awk '{print $$3;}')
# GORELEASER is the path to the goreleaser binary.
GORELEASER = $(shell which goreleaser)

# GOVENDOR is the path to the govendor binary.
GOVENDOR = $(shell which govendor)

# VENDORFMT is the path to the vendorfmt binary.
VENDORFMT = $(shell which vendorfmt)

# pin versions for CI builds
CI_CONSUL_VERSION=1.0.6
CI_VAULT_VERSION=0.9.6
Expand All @@ -46,23 +40,13 @@ help:
@echo "clean - remove temp files"

# build compiles fabio and the test dependencies
build: checkdeps vendorfmt gofmt
build: gofmt
go build

# test runs the tests
test: build
go test -v -test.timeout 15s `go list ./... | grep -v '/vendor/'`

# checkdeps ensures that all required dependencies are vendored in
checkdeps:
[ -x "$(GOVENDOR)" ] || go get -u github.com/kardianos/govendor
govendor list +e | grep '^ e ' && { echo "Found missing packages. Please run 'govendor add +e'"; exit 1; } || : echo

# vendorfmt ensures that the vendor/vendor.json file is formatted correctly
vendorfmt:
[ -x "$(VENDORFMT)" ] || go get -u github.com/magiconair/vendorfmt/cmd/vendorfmt
vendorfmt

# gofmt runs gofmt on the code
gofmt:
gofmt -s -w `find . -type f -name '*.go' | grep -v vendor`
Expand Down Expand Up @@ -156,4 +140,4 @@ clean:
rm -rf pkg dist fabio
find . -name '*.test' -delete

.PHONY: all build checkdeps clean codeship gofmt gorelease help homebrew install linux pkg preflight release tag test vendorfmt
.PHONY: all build clean codeship gofmt gorelease help homebrew install linux pkg preflight release tag test
9 changes: 2 additions & 7 deletions docs/content/contrib/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@ we ask for the following:
already underway.
* Only add libraries if they provide significant value. Consider copying the code
(attribution) or writing it yourself.
* Manage dependencies in the vendor path via `govendor` as separate commits per library
and format the `vendor.json` file with `vendorfmt`. Please make sure your commit
message has the following format:

```
Vendoring in version <git hash> of <pkgname>
```
* Manage dependencies with `go mod` and run `go mod vendor` afterwards to
sync the `vendor` folder for backwards compatibility.

Once you are ready to send in a pull request, be sure to:

Expand Down

0 comments on commit 58c9ff2

Please sign in to comment.