diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-30 10:34:15 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-30 10:34:15 +0100 |
| commit | 3465e1e52c812a4a4f4fe941ab04569ebf2a2c12 (patch) | |
| tree | 5e28219da36739e6c9abf7366105a6102dc47c5c /.gitlab-ci.yml | |
| parent | 5227ea5bc483359bb8a9a40057587651ecb850c2 (diff) | |
| parent | f47e86feaa91d4ba1b268c56dd0a488c7092b573 (diff) | |
| download | gitlab-ce-3465e1e52c812a4a4f4fe941ab04569ebf2a2c12.tar.gz | |
Merge branch 'master' into issue-edit-inline
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 638553d7bf7..dea11bb9f61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,6 +150,7 @@ stages: # Trigger a package build on omnibus-gitlab repository build-package: + image: ruby:2.3-alpine before_script: [] services: [] variables: @@ -486,25 +487,6 @@ lint:javascript:report: paths: - eslint-report.html -# Trigger docs build -# https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/README.md#deployment-process -trigger_docs: - stage: post-test - image: "alpine" - <<: *dedicated-runner - before_script: - - apk update && apk add curl - variables: - GIT_STRATEGY: "none" - cache: {} - artifacts: {} - script: - - "HTTP_STATUS=$(curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} --silent --output curl.log --write-out '%{http_code}' https://gitlab.com/api/v3/projects/1794617/trigger/builds)" - - if [ "${HTTP_STATUS}" -ne "201" ]; then echo "Error ${HTTP_STATUS}"; cat curl.log; echo; exit 1; fi - only: - - master@gitlab-org/gitlab-ce - - master@gitlab-org/gitlab-ee - pages: before_script: [] stage: pages |