From 491b1ed4aac08f6d3e1cd36f302df0c9e2d70c94 Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Wed, 4 Nov 2020 07:56:31 -0800 Subject: [PATCH] fixing paths using env var --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 44461d2..d2bb60a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ export CGO_ENABLED = 1 +GITHUB_WORKSPACE ?= /go/src/github.com/analogj/scrutiny BINARY=\ linux/amd64 \ @@ -16,14 +17,14 @@ $(BINARY): OS = $(word 1,$(subst /, ,$*)) $(BINARY): ARCH = $(word 2,$(subst /, ,$*)) $(BINARY): build/scrutiny-web-%: @echo "building web binary (OS = $(OS), ARCH = $(ARCH))" - xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" github.com/analogj/scrutiny/webapp/backend/cmd/scrutiny/ + xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" ${GITHUB_WORKSPACE}/webapp/backend/cmd/scrutiny/ chmod +x "/build/scrutiny-web-$(OS)-$(ARCH)" file "/build/scrutiny-web-$(OS)-$(ARCH)" || true ldd "/build/scrutiny-web-$(OS)-$(ARCH)" || true @echo "building collector binary (OS = $(OS), ARCH = $(ARCH))" - xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" github.com/analogj/scrutiny/collector/cmd/collector-metrics/ + xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" ${GITHUB_WORKSPACE}/collector/cmd/collector-metrics/ chmod +x "/build/scrutiny-collector-metrics-$(OS)-$(ARCH)" file "/build/scrutiny-collector-metrics-$(OS)-$(ARCH)" || true @@ -33,10 +34,10 @@ windows/amd64: export OS = windows windows/amd64: export ARCH = amd64 windows/amd64: @echo "building web binary (OS = $(OS), ARCH = $(ARCH))" - xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" github.com/analogj/scrutiny/webapp/backend/cmd/scrutiny/ + xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" ${GITHUB_WORKSPACE}/webapp/backend/cmd/scrutiny/ @echo "building collector binary (OS = $(OS), ARCH = $(ARCH))" - xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" github.com/analogj/scrutiny/collector/cmd/collector-metrics/ + xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" ${GITHUB_WORKSPACE}/collector/cmd/collector-metrics/ freebsd/amd64: export GOOS = freebsd freebsd/amd64: export GOARCH = amd64