From 1e38f3b7a12ed314f312f9bd73a7d9f4b47c0969 Mon Sep 17 00:00:00 2001 From: Filippo Giunchedi Date: Thu, 6 Aug 2020 16:36:32 +0200 Subject: [PATCH] fix(make): use GOBIN in all assetfs invocations Make sure the just-built assetfs binary is used. --- make/go.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/go.mk b/make/go.mk index fc0c5963d..adba5209b 100644 --- a/make/go.mk +++ b/make/go.mk @@ -15,7 +15,7 @@ $(GOBIN)/go-bindata: tools/go-bindata/go.mod tools/go-bindata/go.sum $(GOBIN)/go-bindata-assetfs: $(GOBIN)/go-bindata tools/go-bindata/go.mod tools/go-bindata/go.sum $(GO) install -modfile=tools/go-bindata/go.mod github.com/elazarl/go-bindata-assetfs/... cmd/karma/bindata_assetfs.go: $(GOBIN)/go-bindata-assetfs $(SOURCES_JS) ui/build/index.html - go-bindata-assetfs -o cmd/karma/bindata_assetfs.go ui/build/... ui/src/... cmd/karma/tests/bindata/... + $(GOBIN)/go-bindata-assetfs -o cmd/karma/bindata_assetfs.go ui/build/... ui/src/... cmd/karma/tests/bindata/... .DEFAULT_GOAL := $(NAME) $(NAME): go.mod go.sum cmd/karma/bindata_assetfs.go $(SOURCES_GO) @@ -71,7 +71,7 @@ mock-assets: $(GOBIN)/go-bindata-assetfs rm -fr ui/build mkdir ui/build cp ui/public/* ui/build/ - go-bindata-assetfs -o cmd/karma/bindata_assetfs.go -nometadata ui/build/... cmd/karma/tests/bindata/... + $(GOBIN)/go-bindata-assetfs -o cmd/karma/bindata_assetfs.go -nometadata ui/build/... cmd/karma/tests/bindata/... rm -fr ui/build $(GOBIN)/github-release-notes: tools/github-release-notes/go.mod tools/github-release-notes/go.sum