github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
[make] cleanup dc networks and fix frontend target

GitOrigin-RevId: abcd0d061bd924ff0ddf885d1a18b66ebcc7e8e5
This commit is contained in:
Jakob Ackermann 2020-04-22 14:01:50 +02:00 committed by Copybot
parent 310f7a7c60
commit 35400de80a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/Makefile
View file

@ -59,7 +59,7 @@ test_unit_module:
# Frontend unit tests # Frontend unit tests
# #
test_frontend: compile build_test_frontend test_frontend_run test_frontend: build_test_frontend test_frontend_run
test_frontend_run: test_frontend_run:
COMPOSE_PROJECT_NAME=frontend_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down -v -t 0 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_unit_modules test_unit_module test_frontend test_frontend_run \
test_frontend_build_run test_acceptance test_acceptance_app \ test_frontend_build_run test_acceptance test_acceptance_app \
test_acceptance_modules test_acceptance_module ci format format_fix lint \ test_acceptance_modules test_acceptance_module ci format format_fix lint \
build build_test_frontend publish tar build build_test_frontend publish tar

1
services/web/Makefile.module
View file

@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT := \
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} 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)) ifeq (,$(wildcard test/acceptance))
test_acceptance: test_acceptance: