Skip to content

Commit

Permalink
Remove lines that removed heroku/vendor folder.
Browse files Browse the repository at this point in the history
  • Loading branch information
philwinder committed Jan 20, 2017
1 parent 2f64260 commit 61fa41b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ all: $(GOPATH)/bin/fluxctl $(GOPATH)/bin/fluxd $(GOPATH)/bin/fluxsvc build/.flux

.PHONY: release-bins
release-bins:
rm -r ./vendor/github.com/heroku/docker-registry-client/vendor || true # Remove the heroku vendor folder. Won't build without this.
for arch in amd64; do \
for os in linux darwin; do \
CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch go build -o "build/fluxctl_"$$os"_$$arch" $(LDFLAGS) -ldflags "-X main.version=$(shell ./docker/image-tag)" ./cmd/fluxctl/; \
Expand Down Expand Up @@ -52,7 +51,6 @@ build/fluxd: cmd/fluxd/*.go

build/fluxsvc: $(FLUXSVC_DEPS)
build/fluxsvc: cmd/fluxsvc/*.go
rm -r ./vendor/github.com/heroku/docker-registry-client/vendor || true # Remove the heroku vendor folder. Won't build without this.
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o $@ $(LDFLAGS) -ldflags "-X main.version=$(shell ./docker/image-tag)" cmd/fluxsvc/main.go

build/kubectl: cache/kubectl-$(KUBECTL_VERSION) docker/kubectl.version
Expand Down
1 change: 0 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies:
- go get github.com/nats-io/gnatsd
- go get github.com/weaveworks/github-release
- gvt restore
- rm -r ./vendor/github.com/heroku/docker-registry-client/vendor || true # Remove the heroku vendor folder. Won't build without this.

test:
override:
Expand Down

0 comments on commit 61fa41b

Please sign in to comment.