Skip to content

Commit

Permalink
Check in the vendor directory
Browse files Browse the repository at this point in the history
Travis seems to be having issues pulling deps, so we'll have to check in
the vendor directory and prevent the makefile from trying to regenerate
it normally.
  • Loading branch information
DirectXMan12 committed Jul 13, 2018
1 parent 98e16bc commit a293b2b
Show file tree
Hide file tree
Showing 2,526 changed files with 930,931 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
@@ -1,5 +1,4 @@
*.swp
*~
vendor
_output
deploy/adapter
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -32,10 +32,10 @@ endif
all: $(OUT_DIR)/$(ARCH)/adapter

src_deps=$(shell find pkg cmd -type f -name "*.go")
$(OUT_DIR)/%/adapter: vendor $(src_deps)
$(OUT_DIR)/%/adapter: $(src_deps)
CGO_ENABLED=0 GOARCH=$* go build -tags netgo -o $(OUT_DIR)/$*/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter

docker-build: vendor
docker-build:
cp deploy/Dockerfile $(TEMP_DIR)
cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile

Expand Down Expand Up @@ -72,7 +72,7 @@ else
dep ensure -vendor-only -v
endif

test: vendor
test:
CGO_ENABLED=0 go test ./pkg/...

verify-gofmt:
Expand Down
13 changes: 13 additions & 0 deletions vendor/bitbucket.org/ww/goautoneg/Makefile

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

67 changes: 67 additions & 0 deletions vendor/bitbucket.org/ww/goautoneg/README.txt

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

162 changes: 162 additions & 0 deletions vendor/bitbucket.org/ww/goautoneg/autoneg.go

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

1 change: 1 addition & 0 deletions vendor/github.com/NYTimes/gziphandler/.gitignore

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

6 changes: 6 additions & 0 deletions vendor/github.com/NYTimes/gziphandler/.travis.yml

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

75 changes: 75 additions & 0 deletions vendor/github.com/NYTimes/gziphandler/CODE_OF_CONDUCT.md

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

30 changes: 30 additions & 0 deletions vendor/github.com/NYTimes/gziphandler/CONTRIBUTING.md

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

0 comments on commit a293b2b

Please sign in to comment.