Skip to content

Commit 8b18a1c

Browse files
committed
Update Makefile to explicitly pass VERSION_DEV and VERSION to nested make invocations for consistency in build outputs
1 parent 7bc0486 commit 8b18a1c

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ build_native:
7272
./scripts/build_cgo.sh; \
7373
fi
7474

75-
# NOTE: VERSION_DEV must be explicitly passed to nested make invocations.
76-
# VERSION_DEV contains $(shell date ...) which gets re-evaluated when a new make
77-
# process starts. Without passing it explicitly, a minute boundary crossed during
78-
# the build would cause version mismatch between what's displayed and what's built.
7975
build_dev:
8076
@if [ ! -d "$(BUILDKIT_PATH)" ]; then \
8177
echo "Toolchain not found, running build_dev in Docker..."; \
@@ -167,7 +163,7 @@ dev_release: git_check_dev
167163
@echo " Time: $$(date -u +%FT%T%z)"
168164
@echo "═══════════════════════════════════════════════════════"
169165
@read -p "Proceed? [y/N] " confirm && [ "$$confirm" = "y" ] || exit 1
170-
$(MAKE) check frontend build_dev
166+
$(MAKE) check frontend build_dev VERSION_DEV=$(VERSION_DEV)
171167
@read -p "Test on device before release? [y/N] " test_confirm; \
172168
if [ "$$test_confirm" = "y" ]; then \
173169
read -p "Device IP: " device_ip; \
@@ -227,7 +223,7 @@ release: git_check_dev
227223
@echo " Time: $$(date -u +%FT%T%z)"
228224
@echo "═══════════════════════════════════════════════════════"
229225
@read -p "Proceed with PRODUCTION release? [y/N] " confirm && [ "$$confirm" = "y" ] || exit 1
230-
$(MAKE) check frontend build_release
226+
$(MAKE) check frontend build_release VERSION=$(VERSION)
231227
@read -p "Test on device before release? [y/N] " test_confirm; \
232228
if [ "$$test_confirm" = "y" ]; then \
233229
read -p "Device IP: " device_ip; \

0 commit comments

Comments
 (0)