diff options
| -rw-r--r-- | app/views/jobs/_deploy_job_edit.html.haml | 6 | ||||
| -rw-r--r-- | doc/api/runners.md | 4 | ||||
| -rw-r--r-- | doc/examples/build_script_gitlab_ce.md | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/app/views/jobs/_deploy_job_edit.html.haml b/app/views/jobs/_deploy_job_edit.html.haml index 28c1b77..f04029a 100644 --- a/app/views/jobs/_deploy_job_edit.html.haml +++ b/app/views/jobs/_deploy_job_edit.html.haml @@ -21,7 +21,7 @@ .col-sm-10 = job_form.text_field :tag_list, class: 'form-control' .help-block - You can setup jobs to only use runners with specific tags. + This job will only use runners that contain all these tags. Leave blank if you want this job to use any runner .form-group @@ -30,7 +30,7 @@ .col-sm-10 = job_form.text_field :refs, class: 'form-control', placeholder: "master, staging" .help-block - You can specify git references to run deploy jobs. Accepts strings only + Run only when the above git refs strings match the branch or tag that was pushed. .form-group = f.label :commands, 'Script', class: 'control-label' @@ -39,7 +39,7 @@ %p.light All lines will be concatenated into one file and executed. %br - If you change the working directory or the environment this will affect all following lines too. + If you change the working directory or the environment this will affect all following lines. %br = link_to("Example job scripts", "https://gitlab.com/gitlab-org/gitlab-ci/tree/master/doc/examples") = job_form.link_to_remove "Remove this job", class: 'btn btn-danger pull-right' diff --git a/doc/api/runners.md b/doc/api/runners.md index 77c74c8..68b5851 100644 --- a/doc/api/runners.md +++ b/doc/api/runners.md @@ -58,7 +58,7 @@ __Authentication is done by runner token__ Used to removing runners. - POST /runners/delete + DELETE /runners/delete Parameters: @@ -74,4 +74,4 @@ Returns: "updated_at" : "2015-02-26T11:39:39.232Z", "description" : "awesome runner" } -``` +```
\ No newline at end of file diff --git a/doc/examples/build_script_gitlab_ce.md b/doc/examples/build_script_gitlab_ce.md index 71fc672..50fb059 100644 --- a/doc/examples/build_script_gitlab_ce.md +++ b/doc/examples/build_script_gitlab_ce.md @@ -6,10 +6,11 @@ These script can be run to tests of GitLab CE on a [configured](configure_a_runn # Build script used at ci.gitlab.org to test the private GitLab B.V. repo at dev.gitlab.org ```bash -export PATH=~/bin:/usr/local/bin:/usr/bin:/bin - +export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin ruby -v +which ruby gem install bundler --no-ri --no-rdoc + cp config/database.yml.mysql config/database.yml cp config/gitlab.yml.example config/gitlab.yml sed "s/username\:.*$/username\: runner/" -i config/database.yml @@ -17,8 +18,9 @@ sed "s/password\:.*$/password\: 'password'/" -i config/database.yml sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml touch log/application.log touch log/test.log -bundle --without postgres -bundle exec rake test RAILS_ENV=test +bundle install --without postgres production --jobs $(nproc) +bundle exec rake db:create RAILS_ENV=test +RAILS_ENV=test SIMPLECOV=true bundle exec rake test ``` # Build script on [GitHost.io](https://gitlab-ce.githost.io/projects/4/) to test the [GitLab.com repo](https://gitlab.com/gitlab-org/gitlab-ce) |