Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
72fa0640
Unverified
Commit
72fa0640
authored
Jul 04, 2018
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify downstream branch name
parent
5c19f09a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
scripts/trigger-build-docs
scripts/trigger-build-docs
+5
-9
No files found.
.gitlab-ci.yml
View file @
72fa0640
...
...
@@ -272,7 +272,7 @@ package-and-qa:
name
:
review-docs/$CI_COMMIT_REF_SLUG
# 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
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
# Trigger a manual docs build in gitlab-docs only on non docs-only branches.
...
...
scripts/trigger-build-docs
View file @
72fa0640
...
...
@@ -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
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment