summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-10-02 17:29:05 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-10-02 17:29:53 +0200
commit5c1694b45845f32210ccfdec7ed543cb3d9e085f (patch)
tree43014dd9151d945c5330e8dbdc4bf3d8496153f5
parent6e4212ce3151e7dbf54c60a0dfe61681eb87f299 (diff)
downloadgitlab-ce-7125-refactor-code-quality-similar-to-junit-tests-ce.tar.gz
Add legacy artifacts in artifacts_file_for_type7125-refactor-code-quality-similar-to-junit-tests-ce
-rw-r--r--app/models/ci/build.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7780c89c13a..c9091c19705 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -523,7 +523,10 @@ module Ci
end
def artifacts_file_for_type(type)
- job_artifacts.find_by(file_type: Ci::JobArtifact.file_types[type])&.file
+ file = job_artifacts.find_by(file_type: Ci::JobArtifact.file_types[type])&.file
+ # TODO: to be removed once legacy artifacts is removed
+ file ||= legacy_artifacts_file if type == :archive
+ file
end
def coverage_regex