Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
26ace4c7
Commit
26ace4c7
authored
May 31, 2021
by
Marcel Amirault
Committed by
Albert Salim
May 31, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch docs previews to use main branch
parent
033f766a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
.gitlab/ci/docs.gitlab-ci.yml
.gitlab/ci/docs.gitlab-ci.yml
+2
-2
doc/ci/jobs/index.md
doc/ci/jobs/index.md
+1
-1
scripts/trigger-build
scripts/trigger-build
+1
-1
No files found.
.gitlab/ci/docs.gitlab-ci.yml
View file @
26ace4c7
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
# because some repos are private and CI_JOB_TOKEN cannot access files.
# because some repos are private and CI_JOB_TOKEN cannot access files.
# See https://gitlab.com/gitlab-org/gitlab/issues/191273
# See https://gitlab.com/gitlab-org/gitlab/issues/191273
GIT_DEPTH
:
1
GIT_DEPTH
:
1
# By default, deploy the Review App using the `ma
ster
` branch of the `gitlab-org/gitlab-docs` project
# By default, deploy the Review App using the `ma
in
` branch of the `gitlab-org/gitlab-docs` project
DOCS_BRANCH
:
ma
ster
DOCS_BRANCH
:
ma
in
environment
:
environment
:
name
:
review-docs/mr-${CI_MERGE_REQUEST_IID}
name
:
review-docs/mr-${CI_MERGE_REQUEST_IID}
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables
...
...
doc/ci/jobs/index.md
View file @
26ace4c7
...
@@ -29,7 +29,7 @@ jobs, where each of the jobs executes a different command.
...
@@ -29,7 +29,7 @@ jobs, where each of the jobs executes a different command.
Of course a command can execute code directly (
`./configure;make;make install`
)
Of course a command can execute code directly (
`./configure;make;make install`
)
or run a script (
`test.sh`
) in the repository.
or run a script (
`test.sh`
) in the repository.
Jobs are picked up by
[
runners
](
../runners/README.md
)
and executed
with
in the
Jobs are picked up by
[
runners
](
../runners/README.md
)
and executed in the
environment of the runner. What is important is that each job is run
environment of the runner. What is important is that each job is run
independently from each other.
independently from each other.
...
...
scripts/trigger-build
View file @
26ace4c7
...
@@ -255,7 +255,7 @@ module Trigger
...
@@ -255,7 +255,7 @@ module Trigger
end
end
def
ref
def
ref
ENV
[
'DOCS_BRANCH'
]
||
'ma
ster
'
ENV
[
'DOCS_BRANCH'
]
||
'ma
in
'
end
end
# `gitlab-org/gitlab-docs` pipeline trigger "Triggered from gitlab-org/gitlab 'review-docs-deploy' job"
# `gitlab-org/gitlab-docs` pipeline trigger "Triggered from gitlab-org/gitlab 'review-docs-deploy' job"
...
...
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