diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 18:06:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 18:06:03 +0000 |
| commit | 40d3d574132d2849646c20eb9d8742b159d9bfc8 (patch) | |
| tree | 431dee6675639da4421dbb1d6f50b7734a3190c3 /scripts | |
| parent | 5939b09fd3db37ec98dfce0345162617d9d1d313 (diff) | |
| download | gitlab-ce-40d3d574132d2849646c20eb9d8742b159d9bfc8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/lint-doc.sh | 28 | ||||
| -rwxr-xr-x | scripts/trigger-build-docs | 4 |
2 files changed, 9 insertions, 23 deletions
diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh index 8c9b8b9fb02..e2c22785963 100755 --- a/scripts/lint-doc.sh +++ b/scripts/lint-doc.sh @@ -35,30 +35,16 @@ fi # Do not use 'README.md', instead use 'index.md' # Number of 'README.md's as of 2018-03-26 -NUMBER_READMES_CE=46 -NUMBER_READMES_EE=46 +NUMBER_READMES=46 FIND_READMES=$(find doc/ -name "README.md" | wc -l) echo '=> Checking for new README.md files...' -if [ "${CI_PROJECT_NAME}" == 'gitlab-ce' ] +if [ ${FIND_READMES} -ne $NUMBER_READMES ] then - if [ ${FIND_READMES} -ne ${NUMBER_READMES_CE} ] - then - echo - echo ' ✖ ERROR: New README.md file(s) detected, prefer index.md over README.md.' >&2 - echo ' https://docs.gitlab.com/ee/development/documentation/styleguide.html#working-with-directories-and-files' - echo - exit 1 - fi -elif [ "${CI_PROJECT_NAME}" == 'gitlab-ee' ] -then - if [ ${FIND_READMES} -ne $NUMBER_READMES_EE ] - then - echo - echo ' ✖ ERROR: New README.md file(s) detected, prefer index.md over README.md.' >&2 - echo ' https://docs.gitlab.com/ee/development/documentation/styleguide.html#working-with-directories-and-files' - echo - exit 1 - fi + echo + echo ' ✖ ERROR: New README.md file(s) detected, prefer index.md over README.md.' >&2 + echo ' https://docs.gitlab.com/ee/development/documentation/styleguide.html#working-with-directories-and-files' + echo + exit 1 fi echo "✔ Linting passed" diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs index 83841512f1c..046ee5bceb8 100755 --- a/scripts/trigger-build-docs +++ b/scripts/trigger-build-docs @@ -69,9 +69,9 @@ end # def slug case ENV["CI_PROJECT_NAME"] - when 'gitlab-ce' + when 'gitlab-foss' 'ce' - when 'gitlab-ee' + when 'gitlab' 'ee' when 'gitlab-runner' 'runner' |