Kaynağa Gözat

Merge pull request #2766 from overleaf/jpa-make-cleanup

[make] cleanup dc networks and fix frontend target

GitOrigin-RevId: abcd0d061bd924ff0ddf885d1a18b66ebcc7e8e5
Jakob Ackermann 6 yıl önce
ebeveyn
işleme
35400de80a
2 değiştirilmiş dosya ile 3 ekleme ve 2 silme
  1. 2 2
      services/web/Makefile
  2. 1 0
      services/web/Makefile.module

+ 2 - 2
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
+	build build_test_frontend publish tar

+ 1 - 0
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: