summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-07-04 12:26:52 +0200
committerAchilleas Pipinellis <axil@gitlab.com>2018-07-05 11:02:38 +0200
commit72fa064000a5434456544568325ee7b583dbef90 (patch)
tree1efac35d359faac572d5164a7ca5d2c961a67724 /scripts
parent5c19f09a75d13114ff1c7a889edc31f3155f2973 (diff)
downloadgitlab-ce-72fa064000a5434456544568325ee7b583dbef90.tar.gz
Simplify downstream branch name
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/trigger-build-docs14
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs
index 2a0e7f4d76e..9ee35684509 100755
--- a/scripts/trigger-build-docs
+++ b/scripts/trigger-build-docs
@@ -16,18 +16,14 @@ end
GITLAB_DOCS_REPO = 'gitlab-com/gitlab-docs'.freeze
#
-# Truncate the remote docs branch name if it's more than 63 characters
-# otherwise we hit the filesystem limit and the directory name where
-# NGINX serves the site won't match the branch name.
+# Truncate the remote docs branch name otherwise we hit the filesystem
+# limit and the directory name where NGINX serves the site won't match
+# the branch name.
#
def docs_branch
# The maximum string length a file can have on a filesystem (ext4)
- # is 63 characters. Let's use something smaller to be 100% sure.
- max = 42
- # 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]
+ # is 63 characters. CI_ENVIRONMENT_SLUG is limited to 24 characters.
+ ENV["CI_ENVIRONMENT_SLUG"]
end
#