Merge pull request #9639 from jordanlewis/fast-go-generate

build: speed up go generate: don't run ui tests
cockroachdb · Sep 30, 2016 · 48a50f0 · 48a50f0
2 parents 0796fae + 7d62eab
commit 48a50f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ui/Makefile b/ui/Makefile
@@ -56,6 +56,11 @@ GOBINDATA_TARGET = embedded.go
 .PHONY: all
 all: lint test $(GOBINDATA_TARGET)
 
+# Running `go generate` will call this target. Update this if you add new
+# generated files.
+.PHONY: generate
+generate: $(GOBINDATA_TARGET)
+
 # TODO(tamird): is there a way to not repeat this here? It's already in protobuf.mk
 app/js/protos.js generated/protos.json generated/protos.d.ts: $(addprefix $(REPO_ROOT)/, $(sort $(shell cd $(REPO_ROOT) && git ls-files --exclude-standard --cached --others -- '*.proto')))
 	$(MAKE) -C $(ORG_ROOT) -f cockroach/build/protobuf.mk

diff --git a/ui/ui.go b/ui/ui.go
@@ -18,4 +18,4 @@
 // stylesheets.
 package ui
 
-//go:generate make
+//go:generate make generate