Skip to content

Commit 99ea662

Browse files
committed
Fixed bug:
- fetching go-bindata failed. - change the repo of go-bindata to github.com/go-bindata/go-bindata, because old repo has been archived. - pin the go-bindata as v3.3.1. Signed-off-by: jojohappy <[email protected]>
1 parent 8eaebdf commit 99ea662

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ PROTOC_VERSION ?= 3.4.0
2727
# v0.54.0
2828
HUGO_VERSION ?= b1a82c61aba067952fdae2f73b826fe7d0f3fc2f
2929
HUGO ?= $(GOBIN)/hugo-$(HUGO_VERSION)
30+
# v3.1.1
31+
GOBINDATA_VERSION ?= a9c83481b38ebb1c4eb8f0168fd4b10ca1d3c523
32+
GOBINDATA ?= $(GOBIN)/go-bindata-$(GOBINDATA_VERSION)
3033
GIT ?= $(shell which git)
3134
BZR ?= $(shell which bzr)
3235

@@ -90,12 +93,11 @@ all: format build
9093

9194
# assets repacks all statis assets into go file for easier deploy.
9295
.PHONY: assets
93-
assets:
96+
assets: $(GOBINDATA)
9497
@echo ">> deleting asset file"
9598
@rm pkg/ui/bindata.go || true
9699
@echo ">> writing assets"
97-
@go get -u github.com/jteeuwen/go-bindata/...
98-
@go-bindata $(bindata_flags) -pkg ui -o pkg/ui/bindata.go -ignore '(.*\.map|bootstrap\.js|bootstrap-theme\.css|bootstrap\.css)' pkg/ui/templates/... pkg/ui/static/...
100+
@$(GOBINDATA) $(bindata_flags) -pkg ui -o pkg/ui/bindata.go -ignore '(.*\.map|bootstrap\.js|bootstrap-theme\.css|bootstrap\.css)' pkg/ui/templates/... pkg/ui/static/...
99101
@go fmt ./pkg/ui
100102

101103

@@ -278,6 +280,9 @@ $(PROMU):
278280
$(HUGO):
279281
$(call fetch_go_bin_version,github.com/gohugoio/hugo,$(HUGO_VERSION))
280282

283+
$(GOBINDATA):
284+
$(call fetch_go_bin_version,github.com/go-bindata/go-bindata/go-bindata,$(GOBINDATA_VERSION))
285+
281286
$(PROTOC):
282287
@mkdir -p $(TMP_GOPATH)
283288
@echo ">> fetching protoc@${PROTOC_VERSION}"

0 commit comments

Comments
 (0)