Archives/gitian-builder
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cache: require the enable_cache key to be set to true in order to use cache functionality

Browse Source
This commit is contained in:
Cory Fields 2014-09-22 20:06:31 -04:00
parent 07108c4eeb
commit 00d5b9849c
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/gbuild
View File

@ -80,6 +80,7 @@ def build_one_configuration(suite, arch, build_desc, reference_datetime)
system! "copy-to-target #{@quiet_flag} inputs/#{filename} build/" system! "copy-to-target #{@quiet_flag} inputs/#{filename} build/"
end end
if build_desc["enable_cache"]
if File.directory?("cache/#{build_desc["name"]}") if File.directory?("cache/#{build_desc["name"]}")
system! "copy-to-target #{@quiet_flag} cache/#{build_desc["name"]}/ cache/" system! "copy-to-target #{@quiet_flag} cache/#{build_desc["name"]}/ cache/"
end end
@ -87,6 +88,7 @@ def build_one_configuration(suite, arch, build_desc, reference_datetime)
if File.directory?("cache/common") if File.directory?("cache/common")
system! "copy-to-target #{@quiet_flag} cache/common/ cache/" system! "copy-to-target #{@quiet_flag} cache/common/ cache/"
end end
end
info "Updating apt-get repository (log in var/install.log)" info "Updating apt-get repository (log in var/install.log)"
system! "on-target -u root apt-get update > var/install.log 2>&1" system! "on-target -u root apt-get update > var/install.log 2>&1"
@ -173,6 +175,7 @@ in_sums = []
build_dir = 'build' build_dir = 'build'
result_dir = 'result' result_dir = 'result'
cache_dir = 'cache' cache_dir = 'cache'
enable_cache = build_desc["enable_cache"]
FileUtils.rm_rf(build_dir) FileUtils.rm_rf(build_dir)
FileUtils.mkdir(build_dir) FileUtils.mkdir(build_dir)
@ -181,8 +184,10 @@ FileUtils.mkdir_p(result_dir)
package_name = build_desc["name"] or raise "must supply name" package_name = build_desc["name"] or raise "must supply name"
package_name = sanitize(package_name, "package name") package_name = sanitize(package_name, "package name")
if enable_cache
FileUtils.mkdir_p(File.join(cache_dir, "common")) FileUtils.mkdir_p(File.join(cache_dir, "common"))
FileUtils.mkdir_p(File.join(cache_dir, package_name)) FileUtils.mkdir_p(File.join(cache_dir, package_name))
end
suites = build_desc["suites"] or raise "must supply suites" suites = build_desc["suites"] or raise "must supply suites"
archs = build_desc["architectures"] or raise "must supply architectures" archs = build_desc["architectures"] or raise "must supply architectures"
@ -249,10 +254,11 @@ suites.each do |suite|
info "Grabbing results" info "Grabbing results"
system! "copy-from-target #{@quiet_flag} out #{build_dir}" system! "copy-from-target #{@quiet_flag} out #{build_dir}"
if enable_cache
info "Grabbing cache" info "Grabbing cache"
system! "copy-from-target #{@quiet_flag} cache/#{package_name}/ #{cache_dir}" system! "copy-from-target #{@quiet_flag} cache/#{package_name}/ #{cache_dir}"
system! "copy-from-target #{@quiet_flag} cache/common/ #{cache_dir}" system! "copy-from-target #{@quiet_flag} cache/common/ #{cache_dir}"
end
base_manifest = File.read("var/base-#{suite}-#{arch}.manifest") base_manifest = File.read("var/base-#{suite}-#{arch}.manifest")
base_manifests["#{suite}-#{arch}"] = base_manifest base_manifests["#{suite}-#{arch}"] = base_manifest
end end
@ -275,6 +281,7 @@ Dir.glob(File.join(out_dir, '**', '*'), File::FNM_DOTMATCH).sort.each do |file_i
puts out_sums[file] unless @options[:quiet] puts out_sums[file] unless @options[:quiet]
end end
if enable_cache
Dir.glob(File.join(cache_common_dir, '**', '*'), File::FNM_DOTMATCH).sort.each do |file_in_out| Dir.glob(File.join(cache_common_dir, '**', '*'), File::FNM_DOTMATCH).sort.each do |file_in_out|
next if File.directory?(file_in_out) next if File.directory?(file_in_out)
file = file_in_out.sub(cache_common_dir + File::SEPARATOR, '') file = file_in_out.sub(cache_common_dir + File::SEPARATOR, '')
@ -290,6 +297,7 @@ Dir.glob(File.join(cache_package_dir, '**', '*'), File::FNM_DOTMATCH).sort.each
cache_package_sums[file] = `cd #{cache_package_dir} && sha256sum #{file}` cache_package_sums[file] = `cd #{cache_package_dir} && sha256sum #{file}`
raise "failed to sum #{file}" unless $? == 0 raise "failed to sum #{file}" unless $? == 0
end end
end
out_manifest = out_sums.keys.sort.map { |key| out_sums[key] }.join('') out_manifest = out_sums.keys.sort.map { |key| out_sums[key] }.join('')