diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 12:08:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 12:08:40 +0000 |
| commit | be3e24ea3c9f497efde85900df298ce9bc42fce8 (patch) | |
| tree | fd0de9443253a1b21ca9a2741dc34ba3aef795be /.gitlab | |
| parent | 001243986195143c395a9811d8254bbf1b9ebfa1 (diff) | |
| download | gitlab-ce-be3e24ea3c9f497efde85900df298ce9bc42fce8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 4c407045411..121ce76d1dd 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -13,6 +13,7 @@ .default-before_script: before_script: - date + - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/' - export GOPATH=$CI_PROJECT_DIR/.go - mkdir -p $GOPATH - source scripts/utils.sh diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 5a58c3f9416..effc950f3c8 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -40,6 +40,7 @@ paths: - vendor/ruby before_script: + - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/' - cd qa/ - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet - bundle check |