Skip to content
This repository has been archived by the owner on Feb 5, 2020. It is now read-only.

Commit

Permalink
Merge pull request #732 from coreos/revert-721-cache_builds
Browse files Browse the repository at this point in the history
Revert "Always cache go builds with -i"
  • Loading branch information
ggreer authored May 17, 2017
2 parents ddedac4 + e8511c7 commit a4cd78b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions installer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ all: build
build: bin/$(OS)/installer

bin/windows/installer.exe: $(GO_FILES) assets/bindata.go
GOOS=windows go build -i -o bin/windows/installer.exe -ldflags $(LD_FLAGS) $(REPO)/cmd/installer
GOOS=windows go build -o bin/windows/installer.exe -ldflags $(LD_FLAGS) $(REPO)/cmd/installer

bin/%/installer: $(GO_FILES) assets/bindata.go
GOOS=$* go build -i -o bin/$*/installer -ldflags $(LD_FLAGS) $(REPO)/cmd/installer
GOOS=$* go build -o bin/$*/installer -ldflags $(LD_FLAGS) $(REPO)/cmd/installer

.PHONY: backend
backend: assets/bindata.go
GOOS=$(OS) go build -i -o bin/$(OS)/installer -ldflags $(LD_FLAGS) $(REPO)/cmd/installer
GOOS=$(OS) go build -o bin/$(OS)/installer -ldflags $(LD_FLAGS) $(REPO)/cmd/installer

assets/bindata.go: frontend bin/go-bindata $(shell find assets -type f | grep -v .go)
./bin/go-bindata -pkg assets -o assets/bindata.go -ignore=bindata.go -ignore=doc.go -ignore=assets.go -prefix assets assets/...
Expand Down Expand Up @@ -73,10 +73,10 @@ vendor: glide.yaml
tools: bin/go-bindata bin/sanity bin/golint

bin/golint:
CGO_ENABLED=0 go build -i -o bin/golint $(REPO)/vendor/github.com/golang/lint/golint
CGO_ENABLED=0 go build -o bin/golint $(REPO)/vendor/github.com/golang/lint/golint

bin/go-bindata:
go build -i -o bin/go-bindata $(REPO)/vendor/github.com/jteeuwen/go-bindata/go-bindata
go build -o bin/go-bindata $(REPO)/vendor/github.com/jteeuwen/go-bindata/go-bindata

bin/sanity:
go test tests/sanity/k8s_test.go -c -o bin/sanity
Expand Down

0 comments on commit a4cd78b

Please sign in to comment.