From 35400de80a4b1f0a9e20cd611b98465456bd8be0 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 22 Apr 2020 14:01:50 +0200 Subject: [PATCH] Merge pull request #2766 from overleaf/jpa-make-cleanup [make] cleanup dc networks and fix frontend target GitOrigin-RevId: abcd0d061bd924ff0ddf885d1a18b66ebcc7e8e5 --- services/web/Makefile | 4 ++-- services/web/Makefile.module | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/web/Makefile b/services/web/Makefile index c597ae4952..2f6e5e44b6 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -59,7 +59,7 @@ test_unit_module: # Frontend unit tests # -test_frontend: compile build_test_frontend test_frontend_run +test_frontend: build_test_frontend test_frontend_run test_frontend_run: COMPOSE_PROJECT_NAME=frontend_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down -v -t 0 @@ -148,4 +148,4 @@ $(MODULE_TARGETS): test_unit_modules test_unit_module test_frontend test_frontend_run \ test_frontend_build_run test_acceptance test_acceptance_app \ test_acceptance_modules test_acceptance_module ci format format_fix lint \ - build build_test_frontend publish tar \ No newline at end of file + build build_test_frontend publish tar diff --git a/services/web/Makefile.module b/services/web/Makefile.module index 498222087b..a0f649c5fe 100644 --- a/services/web/Makefile.module +++ b/services/web/Makefile.module @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT := \ test_unit: ${DOCKER_COMPOSE_TEST_UNIT} run --rm test_unit npm -q run test:unit:run_dir -- ${MOCHA_ARGS} $(MODULE_DIR)/test/unit/src + ${DOCKER_COMPOSE_TEST_UNIT} down ifeq (,$(wildcard test/acceptance)) test_acceptance: