Skip to content

fix(Makefile): prevent NUM_VALIDATORS from evaluating to two tokens #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ocheretovich wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −1
Open

fix(Makefile): prevent NUM_VALIDATORS from evaluating to two tokens #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ QUAKE_MANIFEST ?= crates/quake/scenarios/localdev.toml
# Recursively expanded so smoke targets that override QUAKE_MANIFEST re-evaluate
# at recipe time. All localdev* scenarios must keep the same validator count
# (5) so `make smoke` produces a single genesis that matches both sub-targets.
NUM_VALIDATORS = $(shell grep -c '^\[nodes\.validator' $(QUAKE_MANIFEST) 2>/dev/null || echo 5)
NUM_VALIDATORS = $(shell \
count=$$(grep -c '^\[nodes\.validator' $(QUAKE_MANIFEST) 2>/dev/null); \
if [ -n "$$count" ] && [ "$$count" -gt 0 ] 2>/dev/null; then echo $$count; else echo 5; fi)
QUAKE := cargo run --bin quake --
DEFAULT_BRANCH ?= $(shell git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
ifeq ($(DEFAULT_BRANCH),)
Expand Down