github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-10 07:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Crew cache git granularity (#6379)

Browse Source 
* Adjust git cachefile name to reflect branch commit if specified

* bump version
This commit is contained in:
Satadru Pramanik
2021-11-08 14:41:47 -05:00
committed by GitHub
parent 48ebbbd3ae
commit af5036e68f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/crew
View File

@@ -700,11 +700,18 @@ def download
if @git == true
# Recall repository from cache if requested
if CREW_CACHE_ENABLED
# No git branch specified, just a git commit or tag
if @pkg.git_branch.nil? || @pkg.git_branch.empty?
abort("No Git branch, commit, or tag specified!").lightred if @pkg.git_hashtag.nil? || @pkg.git_hashtag.empty
cachefile = CREW_CACHE_DIR + filename + @pkg.git_hashtag + '.tar.xz'
puts "cachefile is #{cachefile}".orange if @opt_verbose
# Git branch and git commit specified
elsif ( ! @pkg.git_hashtag.nil? || ! @pkg.git_hashtag.empty ) and ( ! @pkg.git_branch.nil? || ! @pkg.git_branch.empty?)
cachefile = CREW_CACHE_DIR + filename + @pkg.git_branch.gsub(/[^0-9A-Za-z.\-]/, '_') + '_' + @pkg.git_hashtag + '.tar.xz'
puts "cachefile is #{cachefile}".orange if @opt_verbose
# Git branch specified, without a specific git commit.
else
# Use to the day granularity for a branch timestamp.
# Use to the day granularity for a branch timestamp with no specific commit specified.
cachefile = CREW_CACHE_DIR + filename + @pkg.git_branch.gsub(/[^0-9A-Za-z.\-]/, '_') + Time.now.strftime("%m%d%Y") + '.tar.xz'
puts "cachefile is #{cachefile}".orange if @opt_verbose
end

2
lib/const.rb
View File

@@ -1,6 +1,6 @@
# Defines common constants used in different parts of crew
CREW_VERSION = '1.18.0'
CREW_VERSION = '1.18.1'
ARCH_ACTUAL = `uname -m`.chomp
# This helps with virtualized builds on aarch64 machines