diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-25 18:30:25 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-25 18:30:25 +0000 |
| commit | eaa37a4445b303de3665625c6541c914fb1f118b (patch) | |
| tree | 0e76b4861379bee28b5c008d9390499eaf9b2ef1 | |
| parent | ce2e51ae7b088e1527bd32e9ee7f93a1af41b4dc (diff) | |
| parent | 5fd950db21a6967a451f9618318c2a26296873d4 (diff) | |
| download | gitlab-ce-eaa37a4445b303de3665625c6541c914fb1f118b.tar.gz | |
Merge branch '42338-rubocop-cache' into 'master'
Cache rubocop cache for CI
Closes #42338
See merge request gitlab-org/gitlab-ce!16700
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | .rubocop.yml | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 349ea49fe8f..1b409cca95c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -388,7 +388,6 @@ spinach-mysql 2 3: *spinach-metadata-mysql # Static analysis jobs .ruby-static-analysis: &ruby-static-analysis - <<: *pull-cache variables: SIMPLECOV: "false" SETUP_DB: "false" @@ -409,6 +408,12 @@ static-analysis: stage: test script: - scripts/static-analysis + cache: + key: "ruby-2.3.6-with-yarn-and-rubocop" + paths: + - vendor/ruby + - .yarn-cache/ + - tmp/rubocop_cache # Documentation checks: # - Check validity of relative links diff --git a/.rubocop.yml b/.rubocop.yml index 9adc2fae7a8..563a00db6c0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -17,6 +17,7 @@ AllCops: - 'bin/**/*' - 'generator_templates/**/*' - 'builds/**/*' + CacheRootDirectory: tmp # Gitlab ################################################################### |