|
@@ -227,7 +227,7 @@ test_writefull:
|
|
|
# Note: The below cypress targets are for CI only
|
|
# Note: The below cypress targets are for CI only
|
|
|
build_test_frontend_ct:
|
|
build_test_frontend_ct:
|
|
|
$(DOCKER_COMPOSE) build test_frontend_ct
|
|
$(DOCKER_COMPOSE) build test_frontend_ct
|
|
|
- docker run --rm --volume /dev/shm:/dev/shm --user root $(IMAGE_CI) bash -ec 'for path in /overleaf/services/web/cypress/results /overleaf/services/web/cypress/support /overleaf/services/web/node_modules/.cache; do mkdir -p $$path; chown -R node:node $$path; done && tar -cC / overleaf | tar -xC /dev/shm'
|
|
|
|
|
|
|
+ docker run --rm --volume /dev/shm:/dev/shm --user root $(IMAGE_CI) bash -ec 'for path in /overleaf/services/web/cypress/results /overleaf/services/web/cypress/support /overleaf/services/web/.cache; do mkdir -p $$path; chown -R node:node $$path; done && tar -cC / overleaf | tar -xC /dev/shm'
|
|
|
|
|
|
|
|
test_frontend_ct_core_other: export CYPRESS_DOWNLOADS=./cypress/downloads/core
|
|
test_frontend_ct_core_other: export CYPRESS_DOWNLOADS=./cypress/downloads/core
|
|
|
test_frontend_ct_core_other: export CYPRESS_RESULTS=./cypress/results/core
|
|
test_frontend_ct_core_other: export CYPRESS_RESULTS=./cypress/results/core
|
|
@@ -493,13 +493,13 @@ ci:
|
|
|
|
|
|
|
|
# Run the linting commands in the scope of the monorepo.
|
|
# Run the linting commands in the scope of the monorepo.
|
|
|
# Eslint and prettier (plus some configs) are on the root.
|
|
# Eslint and prettier (plus some configs) are on the root.
|
|
|
-RUN_LINTING_CI_MONOREPO = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/eslint.config.mjs:/overleaf/eslint.config.mjs --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc.cjs:/overleaf/.prettierrc.cjs --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json --volume $(MONOREPO)/services/web/data/reports:/overleaf/services/web/data/reports --volume $(MONOREPO)/node_modules/.cache/:/overleaf/node_modules/.cache/ -w /overleaf $(IMAGE_CI) yarn run --silent
|
|
|
|
|
|
|
+RUN_LINTING_CI_MONOREPO = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/eslint.config.mjs:/overleaf/eslint.config.mjs --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc.cjs:/overleaf/.prettierrc.cjs --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json --volume $(MONOREPO)/services/web/data/reports:/overleaf/services/web/data/reports --volume $(MONOREPO)/.cache/:/overleaf/.cache/ -w /overleaf $(IMAGE_CI) yarn run --silent
|
|
|
RUN_LINTING = ../../bin/run -w /overleaf/services/$(PROJECT_NAME) monorepo yarn run --silent
|
|
RUN_LINTING = ../../bin/run -w /overleaf/services/$(PROJECT_NAME) monorepo yarn run --silent
|
|
|
RUN_LINTING_MONOREPO = ../../bin/run monorepo yarn run --silent
|
|
RUN_LINTING_MONOREPO = ../../bin/run monorepo yarn run --silent
|
|
|
|
|
|
|
|
ORG_PATH = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
|
ORG_PATH = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
|
|
RUN_LINT_FORMAT ?= \
|
|
RUN_LINT_FORMAT ?= \
|
|
|
- docker run --rm --env BRANCH_NAME --env CI --env COMMIT_SHA --env MONOREPO --env PATH=/overleaf/node_modules/.bin:$(ORG_PATH) --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc.cjs:/overleaf/.prettierrc.cjs --volume ${PWD}/data/reports:/overleaf/services/web/data/reports --volume $(MONOREPO)/node_modules/.cache/:/overleaf/node_modules/.cache/ ${IMAGE_CI}
|
|
|
|
|
|
|
+ docker run --rm --env BRANCH_NAME --env CI --env COMMIT_SHA --env MONOREPO --env PATH=/overleaf/node_modules/.bin:$(ORG_PATH) --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc.cjs:/overleaf/.prettierrc.cjs --volume ${PWD}/data/reports:/overleaf/services/web/data/reports --volume $(MONOREPO)/.cache/:/overleaf/.cache/ ${IMAGE_CI}
|
|
|
|
|
|
|
|
NODE_MODULES_PATH := ${PATH}:${PWD}/node_modules/.bin:/overleaf/services/web/node_modules/.bin
|
|
NODE_MODULES_PATH := ${PATH}:${PWD}/node_modules/.bin:/overleaf/services/web/node_modules/.bin
|
|
|
WITH_NODE_MODULES_PATH = \
|
|
WITH_NODE_MODULES_PATH = \
|
|
@@ -529,16 +529,16 @@ WITH_CACHE_FOLDER = \
|
|
|
format_jenkins_fix \
|
|
format_jenkins_fix \
|
|
|
format_in_docker \
|
|
format_in_docker \
|
|
|
|
|
|
|
|
-$(WITH_CACHE_FOLDER): ../../node_modules/.cache/prettier/
|
|
|
|
|
-../../node_modules/.cache/prettier/:
|
|
|
|
|
|
|
+$(WITH_CACHE_FOLDER): ../../.cache/prettier/
|
|
|
|
|
+../../.cache/prettier/:
|
|
|
mkdir -p $@
|
|
mkdir -p $@
|
|
|
|
|
|
|
|
-$(WITH_CACHE_FOLDER): ../../node_modules/.cache/eslint/
|
|
|
|
|
-../../node_modules/.cache/eslint/:
|
|
|
|
|
|
|
+$(WITH_CACHE_FOLDER): ../../.cache/eslint/
|
|
|
|
|
+../../.cache/eslint/:
|
|
|
mkdir -p $@
|
|
mkdir -p $@
|
|
|
|
|
|
|
|
-$(WITH_CACHE_FOLDER): ../../node_modules/.cache/stylelint/
|
|
|
|
|
-../../node_modules/.cache/stylelint/:
|
|
|
|
|
|
|
+$(WITH_CACHE_FOLDER): ../../.cache/stylelint/
|
|
|
|
|
+../../.cache/stylelint/:
|
|
|
mkdir -p $@
|
|
mkdir -p $@
|
|
|
|
|
|
|
|
lint: lint_eslint
|
|
lint: lint_eslint
|