Skip to content

Commit

Permalink
Fix make parallelism
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelSpeed committed Jan 7, 2019
1 parent 1dddd81 commit 0a36330
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ BINARY := oauth2_proxy
VERSION := $(shell git describe --always --long --dirty --tags 2>/dev/null || echo "undefined")

.PHONY: all
all: dep lint $(BINARY)
all: dep lint
$(MAKE) $(BINARY)

.PHONY: clean
clean:
Expand Down Expand Up @@ -39,6 +40,7 @@ dep:
$(DEP) ensure --vendor-only

.PHONY: build
.NOTPARALLEL: build
build: clean $(BINARY)

$(BINARY):
Expand All @@ -49,7 +51,7 @@ test: dep lint
$(GO) test -v -race $(go list ./... | grep -v /vendor/)

.PHONY: release
release: dep lint test
release: lint test
mkdir release
GOOS=darwin GOARCH=amd64 go build -ldflags="-X main.VERSION=${VERSION}" -o release/$(BINARY)-darwin-amd64 github.com/pusher/oauth2_proxy
GOOS=linux GOARCH=amd64 go build -ldflags="-X main.VERSION=${VERSION}" -o release/$(BINARY)-linux-amd64 github.com/pusher/oauth2_proxy

0 comments on commit 0a36330

Please sign in to comment.