Commit fe4e676b authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'leipert-fix-linting-script' into 'master'

Ignore deleted files in docs linting

See merge request gitlab-org/gitlab!53741
parents ebc30f20 4a766dd3
...@@ -92,12 +92,12 @@ then ...@@ -92,12 +92,12 @@ then
echo "Merge request pipeline (detached) detected. Testing all files." echo "Merge request pipeline (detached) detected. Testing all files."
else else
MERGE_BASE=$(git merge-base ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA} ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}) MERGE_BASE=$(git merge-base ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA} ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA})
if git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" | grep -E "\.vale|\.markdownlint|lint-doc\.sh" if git diff --diff-filter=d --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" | grep -E "\.vale|\.markdownlint|lint-doc\.sh"
then then
MD_DOC_PATH=${MD_DOC_PATH:-doc} MD_DOC_PATH=${MD_DOC_PATH:-doc}
echo "Vale, Markdownlint, or lint-doc.sh configuration changed. Testing all files." echo "Vale, Markdownlint, or lint-doc.sh configuration changed. Testing all files."
else else
MD_DOC_PATH=$(git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" 'doc/*.md') MD_DOC_PATH=$(git diff --diff-filter=d --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" -- 'doc/*.md')
if [ -n "${MD_DOC_PATH}" ] if [ -n "${MD_DOC_PATH}" ]
then then
echo -e "Merged results pipeline detected. Testing only the following files:\n${MD_DOC_PATH}" echo -e "Merged results pipeline detected. Testing only the following files:\n${MD_DOC_PATH}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment