Skip to content

Commit b4e43c7

Browse files
committed
fix: ensure make recipes return proper exit code
Signed-off-by: Michal Fiedorowicz <mfiedorowicz@netboxlabs.com>
1 parent 7834cbd commit b4e43c7

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Makefile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,24 @@ docker-compose-netbox-plugin-down:
2323

2424
.PHONY: docker-compose-netbox-plugin-test
2525
docker-compose-netbox-plugin-test:
26-
-@$(DOCKER_COMPOSE) -f $(DOCKER_PATH)/docker-compose.yaml -f $(DOCKER_PATH)/docker-compose.test.yaml run -u root --rm netbox ./manage.py test $(TEST_FLAGS) --keepdb $(TEST_SELECTOR)
27-
@$(MAKE) docker-compose-netbox-plugin-down
26+
@$(DOCKER_COMPOSE) -f $(DOCKER_PATH)/docker-compose.yaml -f $(DOCKER_PATH)/docker-compose.test.yaml run -u root --rm netbox ./manage.py test $(TEST_FLAGS) --keepdb $(TEST_SELECTOR); \
27+
EXIT_CODE=$$?; \
28+
$(MAKE) docker-compose-netbox-plugin-down; \
29+
exit $$EXIT_CODE
2830

2931
.PHONY: docker-compose-netbox-plugin-test-lint
3032
docker-compose-netbox-plugin-test-lint:
31-
-@$(DOCKER_COMPOSE) -f $(DOCKER_PATH)/docker-compose.yaml -f $(DOCKER_PATH)/docker-compose.test.yaml run -u root --rm netbox ruff check --output-format=github netbox_diode_plugin
32-
@$(MAKE) docker-compose-netbox-plugin-down
33+
@$(DOCKER_COMPOSE) -f $(DOCKER_PATH)/docker-compose.yaml -f $(DOCKER_PATH)/docker-compose.test.yaml run -u root --rm netbox ruff check --output-format=github netbox_diode_plugin; \
34+
EXIT_CODE=$$?; \
35+
$(MAKE) docker-compose-netbox-plugin-down; \
36+
exit $$EXIT_CODE
3337

3438
.PHONY: docker-compose-netbox-plugin-test-cover
3539
docker-compose-netbox-plugin-test-cover:
36-
-@$(DOCKER_COMPOSE) -f $(DOCKER_PATH)/docker-compose.yaml -f $(DOCKER_PATH)/docker-compose.test.yaml run --rm -u root -e COVERAGE_FILE=/opt/netbox/netbox/coverage/.coverage netbox sh -c "coverage run --source=netbox_diode_plugin --omit=*/migrations/* ./manage.py test --keepdb $(TEST_SELECTOR) && coverage xml -o /opt/netbox/netbox/coverage/report.xml && coverage report -m | tee /opt/netbox/netbox/coverage/report.txt"
37-
@$(MAKE) docker-compose-netbox-plugin-down
40+
@$(DOCKER_COMPOSE) -f $(DOCKER_PATH)/docker-compose.yaml -f $(DOCKER_PATH)/docker-compose.test.yaml run --rm -u root -e COVERAGE_FILE=/opt/netbox/netbox/coverage/.coverage netbox sh -c "coverage run --source=netbox_diode_plugin --omit=*/migrations/* ./manage.py test --keepdb $(TEST_SELECTOR) && coverage xml -o /opt/netbox/netbox/coverage/report.xml && coverage report -m | tee /opt/netbox/netbox/coverage/report.txt"; \
41+
EXIT_CODE=$$?; \
42+
$(MAKE) docker-compose-netbox-plugin-down; \
43+
exit $$EXIT_CODE
3844

3945
.PHONY: docker-compose-generate-matching-docs
4046
docker-compose-generate-matching-docs:

0 commit comments

Comments
 (0)