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

Merge pull request #941 from MikeMcQuaid/test-bot-regex

Browse Source 
test-bot: fix regex placement.
This commit is contained in:
Mike McQuaid 2016-09-12 09:13:29 +01:00 committed by GitHub
commit 2c7ccee771
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dev-cmd/test-bot.rb
View File

@ -403,7 +403,7 @@ module Homebrew
@short_url = @url.gsub("https://github.com/", "")
if @short_url.include? "/commit/"
# 7 characters should be enough for a commit (not 40).
@short_url.gsub!(%r{(commit/\w{7}).*/, '\1'})
@short_url.gsub!(%r{(commit/\w{7}).*/}, '\1')
@name = @short_url
else
@name = "#{@short_url}-#{diff_end_sha1}"
@ -631,7 +631,7 @@ module Homebrew
bottle_step = steps.last
if bottle_step.passed? && bottle_step.output?
bottle_filename =
bottle_step.output.gsub(%r{.*(\./\S+#{Utils::Bottles.native_regex}).*/m, '\1'})
bottle_step.output.gsub(%r{.*(\./\S+#{Utils::Bottles.native_regex}).*/m}, '\1')
bottle_json_filename = bottle_filename.gsub(/\.(\d+\.)?tar\.gz$/, ".json")
bottle_merge_args = ["--merge", "--write", "--no-commit", bottle_json_filename]
bottle_merge_args << "--keep-old" if ARGV.include? "--keep-old"