Skip to content

Commit

Permalink
Merge pull request #14104 from hashicorp/f-consistent-makefile-arrows
Browse files Browse the repository at this point in the history
build: use consistent arrows in makefile step output
  • Loading branch information
shoenig committed Aug 15, 2022
2 parents dadb0a2 + d919c54 commit f6c5700
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,12 @@ generate-all: generate-structs proto generate-examples ## Generate structs, prot
.PHONY: generate-structs
generate-structs: LOCAL_PACKAGES = $(shell go list ./...)
generate-structs: ## Update generated code
@echo "--> Running go generate..."
@echo "==> Running go generate..."
@go generate $(LOCAL_PACKAGES)

.PHONY: proto
proto: ## Generate protobuf bindings
@echo "--> Generating proto bindings..."
@echo "==> Generating proto bindings..."
@buf --config tools/buf/buf.yaml --template tools/buf/buf.gen.yaml generate

.PHONY: generate-examples
Expand All @@ -235,7 +235,7 @@ changelog: ## Generate changelog from entries
## that do not successfully compile without rendering
.PHONY: hclfmt
hclfmt: ## Format HCL files with hclfmt
@echo "--> Formatting HCL"
@echo "==> Formatting HCL"
@find . -name '.terraform' -prune \
-o -name 'upstart.nomad' -prune \
-o -name '.git' -prune \
Expand All @@ -248,10 +248,10 @@ hclfmt: ## Format HCL files with hclfmt

.PHONY: tidy
tidy: ## Tidy up the go mod files
@echo "--> Tidy up submodules"
@echo "==> Tidy up submodules"
@cd tools && go mod tidy
@cd api && go mod tidy
@echo "--> Tidy nomad module"
@echo "==> Tidy nomad module"
@go mod tidy

.PHONY: dev
Expand Down Expand Up @@ -360,24 +360,24 @@ testcluster: ## Bring up a Linux test cluster using Vagrant. Set PROVIDER if nec

.PHONY: static-assets
static-assets: ## Compile the static routes to serve alongside the API
@echo "--> Generating static assets"
@echo "==> Generating static assets"
@go-bindata-assetfs -pkg agent -prefix ui -modtime 1480000000 -tags ui -o bindata_assetfs.go ./ui/dist/...
@mv bindata_assetfs.go command/agent

.PHONY: test-ui
test-ui: ## Run Nomad UI test suite
@echo "--> Installing JavaScript assets"
@echo "==> Installing JavaScript assets"
@cd ui && npm rebuild node-sass
@cd ui && yarn install
@echo "--> Running ember tests"
@echo "==> Running ember tests"
@cd ui && npm test

.PHONY: ember-dist
ember-dist: ## Build the static UI assets from source
@echo "--> Installing JavaScript assets"
@echo "==> Installing JavaScript assets"
@cd ui && yarn install --silent --network-timeout 300000
@cd ui && npm rebuild node-sass
@echo "--> Building Ember application"
@echo "==> Building Ember application"
@cd ui && npm run build

.PHONY: dev-ui
Expand Down

0 comments on commit f6c5700

Please sign in to comment.