diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-20 14:10:24 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-20 14:10:24 +0000 |
| commit | 40ded704cc9b535bee9afd45512d52173c3fc0e7 (patch) | |
| tree | 21cb23a71334f3dae5a988600d163ca1de459fd1 | |
| parent | 9c3f094a2f7609386ed182e4d5f6f9e7f6938388 (diff) | |
| parent | 41884ba1a1e7cf18014940b7e35d41cd6158ab4a (diff) | |
| download | gitlab-ce-40ded704cc9b535bee9afd45512d52173c3fc0e7.tar.gz | |
Merge branch 'rc/cleanup-some-jobs' into 'master'
Improve the build-package and .review-docs jobs
See merge request gitlab-org/gitlab-ce!14938
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 188e78d167b..7757c8a7979 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,12 +154,8 @@ stages: # Trigger a package build in omnibus-gitlab repository build-package: - image: ruby:2.3-alpine + image: ruby:2.4-alpine before_script: [] - services: [] - variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" stage: build cache: {} when: manual @@ -180,13 +176,9 @@ build-package: - apk add --update openssl - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs - chmod 755 trigger-build-docs - services: [] cache: {} dependencies: [] - artifacts: {} variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" GIT_STRATEGY: none when: manual only: |