diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-05-03 14:39:27 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-05-03 14:39:27 +0000 |
commit | 96aa083854f8204a80851017ba547ea3b732e273 (patch) | |
tree | d2ee29b1cc18eb8eb10d77d770452394f7e437dc | |
parent | d5c4cb567f970cae7fbafee542480d0a55b0c050 (diff) | |
parent | a8cbec49a09fc82f5d6b0a74f06858b667f39a56 (diff) | |
download | gitlab-ce-96aa083854f8204a80851017ba547ea3b732e273.tar.gz |
Merge branch 'sh-cache-rubocop-cwd' into 'master'
Cache current working directory to speed up Rubocop
Closes #61383
See merge request gitlab-org/gitlab-ce!28066
-rw-r--r-- | rubocop/qa_helpers.rb | 2 | ||||
-rw-r--r-- | rubocop/spec_helpers.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rubocop/qa_helpers.rb b/rubocop/qa_helpers.rb index f4adf7f4e9f..95875d64727 100644 --- a/rubocop/qa_helpers.rb +++ b/rubocop/qa_helpers.rb @@ -5,7 +5,7 @@ module RuboCop def in_qa_file?(node) path = node.location.expression.source_buffer.name - path.start_with?(File.join(Dir.pwd, 'qa')) + path.start_with?(File.join(RuboCop::PathUtil.pwd, 'qa')) end end end diff --git a/rubocop/spec_helpers.rb b/rubocop/spec_helpers.rb index 63c1b975a65..ecd77c4351d 100644 --- a/rubocop/spec_helpers.rb +++ b/rubocop/spec_helpers.rb @@ -6,14 +6,16 @@ module RuboCop # Returns true if the given node originated from the spec directory. def in_spec?(node) path = node.location.expression.source_buffer.name + pwd = RuboCop::PathUtil.pwd !SPEC_HELPERS.include?(File.basename(path)) && - path.start_with?(File.join(Dir.pwd, 'spec'), File.join(Dir.pwd, 'ee', 'spec')) + path.start_with?(File.join(pwd, 'spec'), File.join(pwd, 'ee', 'spec')) end def migration_directories @migration_directories ||= MIGRATION_SPEC_DIRECTORIES.map do |dir| - [File.join(Dir.pwd, dir), File.join(Dir.pwd, 'ee', dir)] + pwd = RuboCop::PathUtil.pwd + [File.join(pwd, dir), File.join(pwd, 'ee', dir)] end.flatten end |