Merge pull request #437 from projectsyn/feat/component-template/compile-cmd

component-template: Split `COMMODORE_CMD` and `COMPILE_CMD` in Makefile

Author: simu

commodore/component-template/{{ cookiecutter.slug }}/Makefile

@@ -43,7 +43,7 @@ docs-serve: ## Preview the documentation
 .PHONY: compile
 .compile:
 	mkdir -p dependencies
-	$(COMMODORE_CMD)
+	$(COMPILE_CMD)
 
 .PHONY: test
 test: commodore_args += -f tests/$(instance).yml

commodore/component-template/{{ cookiecutter.slug }}/Makefile.vars.mk

@@ -31,7 +31,8 @@ VALE_ARGS ?= --minAlertLevel=error --config=/pages/ROOT/pages/.vale.ini /pages
 ANTORA_PREVIEW_CMD ?= $(DOCKER_CMD) run --rm --publish 35729:35729 --publish 2020:2020 --volume "${PWD}/.git":/preview/antora/.git --volume "${PWD}/docs":/preview/antora/docs docker.io/vshn/antora-preview:3.0.1.1 --style=syn --antora=docs
 
 
-COMMODORE_CMD  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) docker.io/projectsyn/commodore:latest component compile . $(commodore_args)
+COMMODORE_CMD  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) docker.io/projectsyn/commodore:latest
+COMPILE_CMD    ?= $(COMMODORE_CMD) component compile . $(commodore_args)
 JB_CMD         ?= $(DOCKER_CMD) $(DOCKER_ARGS) --entrypoint /usr/local/bin/jb docker.io/projectsyn/commodore:latest install
 
 instance ?= defaults

tests/test_component_template.py

@@ -320,9 +320,14 @@ def test_check_golden_diff(tmp_path: P):
     )
     assert exit_status == 0
 
-    # Call `make lint` in component directory
+    # Override component Makefile COMMODORE_CMD to use the local Commodore binary
+    env = os.environ
+    env["COMMODORE_CMD"] = "commodore"
+
+    # Call `make golden-diff` in component directory
     exit_status = call(
         "make golden-diff",
+        env=env,
         shell=True,
         cwd=tmp_path / "dependencies" / component_name,
     )