Remove unnecessary changes
This commit is contained in:
parent
63a9d582aa
commit
8a89efd87a
1 changed files with 10 additions and 6 deletions
|
@ -84,6 +84,8 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def erase!
|
def erase!
|
||||||
|
job.job_artifacts_trace&.destory
|
||||||
|
|
||||||
paths.each do |trace_path|
|
paths.each do |trace_path|
|
||||||
FileUtils.rm(trace_path, force: true)
|
FileUtils.rm(trace_path, force: true)
|
||||||
end
|
end
|
||||||
|
@ -106,6 +108,14 @@ module Gitlab
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def current_path
|
||||||
|
@current_path ||= paths.find do |trace_path|
|
||||||
|
File.exist?(trace_path)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
##
|
||||||
|
# This doesn't include the latest path JobArtifactUploader#default_path.
|
||||||
def paths
|
def paths
|
||||||
[
|
[
|
||||||
default_path,
|
default_path,
|
||||||
|
@ -113,12 +123,6 @@ module Gitlab
|
||||||
].compact
|
].compact
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_path
|
|
||||||
@current_path ||= paths.find do |trace_path|
|
|
||||||
File.exist?(trace_path)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def default_directory
|
def default_directory
|
||||||
File.join(
|
File.join(
|
||||||
Settings.gitlab_ci.builds_path,
|
Settings.gitlab_ci.builds_path,
|
||||||
|
|
Loading…
Reference in a new issue