Merge pull request #4016 from overleaf/jpa-faster-ci-4288

[perf] faster CI

GitOrigin-RevId: 858c0c4947e41961dae35cb20e0fcc2e2f723787
This commit is contained in:
Jakob Ackermann
2021-05-18 02:07:44 +00:00
committed by Copybot
parent 01c8a8a04d
commit 1d95137e13
8 changed files with 56 additions and 3 deletions
+6
View File
@@ -33,6 +33,7 @@ endif
ifeq (,$(wildcard test/acceptance))
test_acceptance:
test_acceptance_merged_inner:
clean_test_acceptance:
else
@@ -41,6 +42,11 @@ test_acceptance:
${DOCKER_COMPOSE_TEST_ACCEPTANCE} run --rm test_acceptance npm -q run test:acceptance:run_dir -- ${MOCHA_ARGS} $(MODULE_DIR)/test/acceptance/src
$(MAKE) --no-print-directory clean_test_acceptance
test_acceptance_merged_inner:
cd ../../ && \
SHARELATEX_CONFIG=/app/$(MODULE_DIR)/test/acceptance/config/settings.test.coffee \
npm -q run test:acceptance:run_dir -- ${MOCHA_ARGS} $(MODULE_DIR)/test/acceptance/src
clean_test_acceptance:
${DOCKER_COMPOSE_TEST_ACCEPTANCE} down -v -t 0