From 61fa41b90e3de230b8e4888959bf3d9d3dff544e Mon Sep 17 00:00:00 2001 From: Phil Winder Date: Fri, 20 Jan 2017 10:23:05 +0000 Subject: [PATCH] Remove lines that removed heroku/vendor folder. --- Makefile | 2 -- circle.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 2e20dd1a5..a292e3f59 100644 --- a/Makefile +++ b/Makefile @@ -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/; \ @@ -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 diff --git a/circle.yml b/circle.yml index 3118af9a4..582f4771f 100644 --- a/circle.yml +++ b/circle.yml @@ -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: