kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Simplify downstream branch name

Browse source
This commit is contained in:
Achilleas Pipinellis 2018-07-04 12:26:52 +02:00
parent 5c19f09a75
commit 72fa064000
No known key found for this signature in database
GPG key ID: A0996FBD3E92C17B
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -272,7 +272,7 @@ package-and-qa:
name: review-docs/$CI_COMMIT_REF_SLUG name: review-docs/$CI_COMMIT_REF_SLUG
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693 # Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
on_stop: review-docs-cleanup on_stop: review-docs-cleanup
# Trigger a manual docs build in gitlab-docs only on non docs-only branches. # Trigger a manual docs build in gitlab-docs only on non docs-only branches.

14
scripts/trigger-build-docs
View file

@ -16,18 +16,14 @@ end
GITLAB_DOCS_REPO = 'gitlab-com/gitlab-docs'.freeze GITLAB_DOCS_REPO = 'gitlab-com/gitlab-docs'.freeze
# #
# Truncate the remote docs branch name if it's more than 63 characters # Truncate the remote docs branch name otherwise we hit the filesystem
# otherwise we hit the filesystem limit and the directory name where # limit and the directory name where NGINX serves the site won't match
# NGINX serves the site won't match the branch name. # the branch name.
# #
def docs_branch def docs_branch
# The maximum string length a file can have on a filesystem (ext4) # The maximum string length a file can have on a filesystem (ext4)
# is 63 characters. Let's use something smaller to be 100% sure. # is 63 characters. CI_ENVIRONMENT_SLUG is limited to 24 characters.
max = 42 ENV["CI_ENVIRONMENT_SLUG"]
# Prefix the remote branch with the slug of the project in order
# to avoid name conflicts in the rare case the branch name already
# exists in the docs repo and truncate to max length.
"#{slug}-#{ENV["CI_ENVIRONMENT_SLUG"]}"[0...max]
end end
# #