diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 15:06:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 15:06:34 +0000 |
| commit | f1a5755898e865428c923587402fd965b601c4ea (patch) | |
| tree | a93aab01a1d3ba0e93c0fbf1450babfe4674f9dc /.gitlab | |
| parent | 1ae627c65192ae1a01fdac253065ef561a9d6b7e (diff) | |
| download | gitlab-ce-f1a5755898e865428c923587402fd965b601c4ea.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/setup.gitlab-ci.yml | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 1c4571033af..70f3620aa79 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -13,6 +13,8 @@ .default-before_script: before_script: - date + - export GOPATH=$CI_PROJECT_DIR/.go + - mkdir -p $GOPATH - source scripts/utils.sh - source scripts/prepare_build.sh - date @@ -22,6 +24,7 @@ cache: key: "debian-stretch-ruby-2.6.3-node-12.x" paths: + - .go/pkg/mod - vendor/ruby - .yarn-cache/ - vendor/gitaly-ruby @@ -52,7 +55,7 @@ - "{babel.config,jest.config}.js" - "config.ru" - "{package.json,yarn.lock}" - - "{app,bin,config,danger,db,ee,fixtures,haml_lint,lib,public,rubocop,scripts,spec,symbol,vendor}/**/*" + - "{app,bin,config,danger,db,ee,fixtures,haml_lint,lib,locale,public,rubocop,scripts,spec,symbol,vendor}/**/*" - "doc/README.md" # Some RSpec test rely on this file .only-qa-changes: @@ -83,7 +86,7 @@ - "{babel.config,jest.config}.js" - "config.ru" - "{package.json,yarn.lock}" - - "{app,bin,config,danger,db,ee,fixtures,haml_lint,lib,public,rubocop,scripts,spec,symbol,vendor}/**/*" + - "{app,bin,config,danger,db,ee,fixtures,haml_lint,lib,locale,public,rubocop,scripts,spec,symbol,vendor}/**/*" - "doc/README.md" # Some RSpec test rely on this file - ".dockerignore" - "qa/**/*" @@ -123,3 +126,4 @@ only: variables: - $CI_PROJECT_NAME == "gitlab" + - $CI_PROJECT_NAME == "gitlab-ee" # Support former project name for forks/mirrors diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 04e81051031..8851f2ba211 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -95,6 +95,8 @@ setup-test-env: - tmp/tests - config/secrets.yml - vendor/gitaly-ruby + cache: + policy: pull-push rspec unit pg: extends: .rspec-base-pg diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 129913a9f2d..861f3f1af5b 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -43,5 +43,6 @@ no_ee_check: - scripts/no-ee-check only: variables: - - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAME == "gitlab-foss" - - $CI_SERVER_HOST == "dev.gitlab.org" && $CI_PROJECT_NAME == "gitlabhq" + - $CI_PROJECT_NAME == "gitlab-foss" + - $CI_PROJECT_NAME == "gitlab-ce" # Support former project name for forks/mirrors + - $CI_PROJECT_NAME == "gitlabhq" # Support former project name for dev |