admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

brew-test-bot: shorten Jenkins env SHA-1s.

Browse Source
This commit is contained in:
Mike McQuaid 2013-05-26 01:34:16 +01:00
parent 95ab813b35
commit 1856f8eadf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Contributions/cmd/brew-test-bot.rb
View File

@ -133,8 +133,12 @@ class Test
end end
def download def download
def shorten_revision revision
git("rev-parse --short #{revision}").strip
end
def current_sha1 def current_sha1
git('rev-parse --short HEAD').strip shorten_revision 'HEAD'
end end
def current_branch def current_branch
@ -146,8 +150,8 @@ class Test
# Use Jenkins environment variables if present. # Use Jenkins environment variables if present.
if ENV['GIT_PREVIOUS_COMMIT'] and ENV['GIT_COMMIT'] if ENV['GIT_PREVIOUS_COMMIT'] and ENV['GIT_COMMIT']
diff_start_sha1 = ENV['GIT_PREVIOUS_COMMIT'] diff_start_sha1 = shorten_revision ENV['GIT_PREVIOUS_COMMIT']
diff_end_sha1 = ENV['GIT_COMMIT'] diff_end_sha1 = shorten_revision ENV['GIT_COMMIT']
test "brew update" if current_branch == "master" test "brew update" if current_branch == "master"
elsif @hash or @url elsif @hash or @url
diff_start_sha1 = current_sha1 diff_start_sha1 = current_sha1