Merge remote-tracking branch 'markito/develop' into develop

This commit is contained in:
Luke K 2020-07-29 14:54:36 +00:00
commit c3d983907d
No known key found for this signature in database
GPG Key ID: 4896F75BAF2E1966
1 changed files with 24 additions and 4 deletions

View File

@ -1,17 +1,37 @@
REPO := quay.io/boson/faas REPO := quay.io/boson/faas
BIN := faas BIN := faas
DARWIN=$(BIN)_darwin_amd64
LINUX=$(BIN)_linux_amd64
WINDOWS=$(BIN)_windows_amd64.exe
CODE := $(shell find . -name '*.go') CODE := $(shell find . -name '*.go')
DATE := $(shell date -u +"%Y%m%dT%H%M%SZ") DATE := $(shell date -u +"%Y%m%dT%H%M%SZ")
HASH := $(shell git rev-parse --short HEAD 2>/dev/null) HASH := $(shell git rev-parse --short HEAD 2>/dev/null)
VTAG := $(shell git tag --points-at HEAD) VTAG := $(shell git tag --points-at HEAD)
VERS := $(shell [ -z $(VTAG) ] && echo 'tip' || echo $(VTAG) ) VERS := $(shell [ -z $(VTAG) ] && echo 'tip' || echo $(VTAG) )
all: $(BIN)
build: all build: all
all: $(LINUX)
cross-platform: $(DARWIN) $(LINUX) $(WINDOWS)
$(BIN): $(CODE) darwin: $(DARWIN) ## Build for Darwin (macOS)
go build -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
linux: $(LINUX) ## Build for Linux
windows: $(WINDOWS) ## Build for Windows
$(DARWIN):
env GOOS=darwin GOARCH=amd64 go build -v -o $(DARWIN) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
$(LINUX):
env GOOS=linux GOARCH=amd64 go build -v -o $(LINUX) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
$(WINDOWS):
env GOOS=windows GOARCH=amd64 go build -v -o $(WINDOWS) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
# $(BIN): $(CODE)
# go build -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
test: test:
go test -cover -coverprofile=coverage.out ./... go test -cover -coverprofile=coverage.out ./...
@ -39,5 +59,5 @@ latest:
docker push $(REPO):latest docker push $(REPO):latest
clean: clean:
-@rm -f $(BIN) rm -f $(WINDOWS) $(LINUX) $(DARWIN)
-@rm -f coverage.out -@rm -f coverage.out