From 1856f8eadf68cb69195dac95ac79857485789b74 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 26 May 2013 01:34:16 +0100 Subject: [PATCH] brew-test-bot: shorten Jenkins env SHA-1s. --- Library/Contributions/cmd/brew-test-bot.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index bcd949e0b7..71d44d380b 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -133,8 +133,12 @@ class Test end def download + def shorten_revision revision + git("rev-parse --short #{revision}").strip + end + def current_sha1 - git('rev-parse --short HEAD').strip + shorten_revision 'HEAD' end def current_branch @@ -146,8 +150,8 @@ class Test # Use Jenkins environment variables if present. if ENV['GIT_PREVIOUS_COMMIT'] and ENV['GIT_COMMIT'] - diff_start_sha1 = ENV['GIT_PREVIOUS_COMMIT'] - diff_end_sha1 = ENV['GIT_COMMIT'] + diff_start_sha1 = shorten_revision ENV['GIT_PREVIOUS_COMMIT'] + diff_end_sha1 = shorten_revision ENV['GIT_COMMIT'] test "brew update" if current_branch == "master" elsif @hash or @url diff_start_sha1 = current_sha1