Fix doc, test, and form
This commit is contained in:
Lin Jen-Shin
parent
6e0cf082e5
commit
468e8b5558
4 changed files with 13 additions and 90 deletions
|
|
@ -45,6 +45,14 @@
|
|||
Per job in minutes. If a job passes this threshold, it will be marked as failed
|
||||
= link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'timeout'), target: '_blank'
|
||||
|
||||
%hr
|
||||
.form-group
|
||||
= f.label :ci_config_file, 'Custom CI Config File', class: 'label-light'
|
||||
= f.text_field :ci_config_file, class: 'form-control', placeholder: '.gitlab-ci.yml'
|
||||
%p.help-block
|
||||
Optionally specify the location of your CI config file, e.g. my/path or my/path/.my-config.yml.
|
||||
Default is to use '.gitlab-ci.yml' in the repository root.
|
||||
|
||||
%hr
|
||||
.form-group
|
||||
.checkbox
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
- page_title "CI/CD Pipelines"
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
.col-lg-9
|
||||
%h5.prepend-top-0
|
||||
Pipelines
|
||||
= form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project), remote: true, authenticity_token: true do |f|
|
||||
%fieldset.builds-feature
|
||||
- unless @repository.gitlab_ci_yml
|
||||
.form-group
|
||||
%p Pipelines need to be configured before you can begin using Continuous Integration.
|
||||
= link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
|
||||
.form-group
|
||||
%p Get recent application code using the following command:
|
||||
.radio
|
||||
= f.label :build_allow_git_fetch_false do
|
||||
= f.radio_button :build_allow_git_fetch, 'false'
|
||||
%strong git clone
|
||||
%br
|
||||
%span.descr Slower but makes sure you have a clean dir before every build
|
||||
.radio
|
||||
= f.label :build_allow_git_fetch_true do
|
||||
= f.radio_button :build_allow_git_fetch, 'true'
|
||||
%strong git fetch
|
||||
%br
|
||||
%span.descr Faster
|
||||
|
||||
.form-group
|
||||
= f.label :build_timeout_in_minutes, 'Timeout', class: 'label-light'
|
||||
= f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
|
||||
%p.help-block per build in minutes
|
||||
.form-group
|
||||
= f.label :ci_config_file, 'Custom CI Config File', class: 'label-light'
|
||||
= f.text_field :ci_config_file, class: 'form-control', placeholder: '.gitlab-ci.yml'
|
||||
%p.help-block
|
||||
Optionally specify the location of your CI config file E.g. my/path or my/path/.my-config.yml.
|
||||
Default is to use '.gitlab-ci.yml' in the repository root.
|
||||
|
||||
.form-group
|
||||
= f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
|
||||
.input-group
|
||||
%span.input-group-addon /
|
||||
= f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
|
||||
%span.input-group-addon /
|
||||
%p.help-block
|
||||
We will use this regular expression to find test coverage output in build trace.
|
||||
Leave blank if you want to disable this feature
|
||||
.bs-callout.bs-callout-info
|
||||
%p Below are examples of regex for existing tools:
|
||||
%ul
|
||||
%li
|
||||
Simplecov (Ruby) -
|
||||
%code \(\d+.\d+\%\) covered
|
||||
%li
|
||||
pytest-cov (Python) -
|
||||
%code \d+\%\s*$
|
||||
%li
|
||||
phpunit --coverage-text --colors=never (PHP) -
|
||||
%code ^\s*Lines:\s*\d+.\d+\%
|
||||
%li
|
||||
gcovr (C/C++) -
|
||||
%code ^TOTAL.*\s+(\d+\%)$
|
||||
%li
|
||||
tap --coverage-report=text-summary (Node.js) -
|
||||
%code ^Statements\s*:\s*([^%]+)
|
||||
|
||||
.form-group
|
||||
.checkbox
|
||||
= f.label :public_builds do
|
||||
= f.check_box :public_builds
|
||||
%strong Public pipelines
|
||||
.help-block Allow everyone to access pipelines for Public and Internal projects
|
||||
|
||||
.form-group.append-bottom-default
|
||||
= f.label :runners_token, "Runners token", class: 'label-light'
|
||||
= f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
|
||||
%p.help-block The secure token used to checkout project.
|
||||
|
||||
= f.submit 'Save changes', class: "btn btn-save"
|
||||
|
||||
%hr
|
||||
|
||||
.row.prepend-top-default
|
||||
= render partial: 'badge', collection: @badges
|
||||
|
|
@ -29,10 +29,10 @@ if the job surpasses the threshold, it is marked as failed.
|
|||
|
||||
## Custom CI Config File
|
||||
|
||||
> - [Introduced][ce-15041] in GitLab 8.13.
|
||||
> - [Introduced][ce-12509] in GitLab 9.4.
|
||||
|
||||
By default we look for the `.gitlab-ci.yml` file in the projects root
|
||||
directory. If you require a different location **within** the repository
|
||||
By default we look for the `.gitlab-ci.yml` file in the project's root
|
||||
directory. If you require a different location **within** the repository,
|
||||
you can set a custom filepath that will be used to lookup the config file,
|
||||
this filepath should be **relative** to the root.
|
||||
|
||||
|
|
@ -131,3 +131,4 @@ into your `README.md`:
|
|||
[var]: ../../../ci/yaml/README.md#git-strategy
|
||||
[coverage report]: #test-coverage-parsing
|
||||
[ce-9362]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9362
|
||||
[ce-12509]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12509
|
||||
|
|
|
|||
|
|
@ -383,6 +383,7 @@ Project:
|
|||
- printing_merge_request_link_enabled
|
||||
- build_allow_git_fetch
|
||||
- last_repository_updated_at
|
||||
- ci_config_file
|
||||
Author:
|
||||
- name
|
||||
ProjectFeature:
|
||||
|
|
|
|||
Loading…
Reference in a new issue