seperate struct and proto generation

This commit is contained in:
Alex Dadgar
2018-11-07 11:51:03 -08:00
parent ad4c26a1e3
commit 873cf30af1

View File

@@ -191,9 +191,12 @@ checkscripts: ## Lint shell scripts
@echo "==> Linting scripts..."
@shellcheck ./scripts/*
.PHONY: generate
generate: LOCAL_PACKAGES = $(shell go list ./... | grep -v '/vendor/')
generate: proto ## Update generated code
.PHONY: generate-all
generate-all: generate-structs proto
.PHONY: generate-structs
generate-structs: LOCAL_PACKAGES = $(shell go list ./... | grep -v '/vendor/')
generate-structs: ## Update generated code
@go generate $(LOCAL_PACKAGES)
.PHONY: proto
@@ -232,7 +235,7 @@ dev: vendorfmt changelogfmt ## Build for the current development platform
.PHONY: prerelease
prerelease: GO_TAGS=ui release
prerelease: check generate ember-dist static-assets ## Generate all the static assets for a Nomad release
prerelease: check generate-all ember-dist static-assets ## Generate all the static assets for a Nomad release
.PHONY: release
release: GO_TAGS=ui release
@@ -288,7 +291,7 @@ clean: ## Remove build artifacts
.PHONY: travis
travis: ## Run Nomad test suites with output to prevent timeouts under Travis CI
@if [ ! $(SKIP_NOMAD_TESTS) ]; then \
make generate; \
make generate-structs; \
fi
@sh -C "$(PROJECT_ROOT)/scripts/travis.sh"