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

test-bot: use audit --strict on added formulae.

Browse Source
This commit is contained in:
Mike McQuaid 2014-12-27 13:03:40 +00:00
parent 5fdb89aed9
commit b3a15ad6ef
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Homebrew/cmd/test-bot.rb
View File

@ -234,6 +234,15 @@ module Homebrew
git("rev-list", "--count", "#{start_revision}..#{end_revision}").to_i == 1 git("rev-list", "--count", "#{start_revision}..#{end_revision}").to_i == 1
end end
def diff_formulae start_revision, end_revision, path, filter
git(
"diff-tree", "-r", "--name-only", "--diff-filter=#{filter}",
start_revision, end_revision, "--", path
).lines.map do |line|
File.basename(line.chomp, ".rb")
end
end
@category = __method__ @category = __method__
@start_branch = current_branch @start_branch = current_branch
@ -299,12 +308,9 @@ module Homebrew
formula_path = "Library/Formula" formula_path = "Library/Formula"
end end
git( @added_formulae = diff_formulae(diff_start_sha1, diff_end_sha1, formula_path, "A")
"diff-tree", "-r", "--name-only", "--diff-filter=AM", @modified_formula = diff_formulae(diff_start_sha1, diff_end_sha1, formula_path, "M")
diff_start_sha1, diff_end_sha1, "--", formula_path @formulae += @added_formulae + @modified_formula
).each_line do |line|
@formulae << File.basename(line.chomp, ".rb")
end
end end
def skip formula_name def skip formula_name
@ -410,7 +416,9 @@ module Homebrew
ENV["HOMEBREW_DEVELOPER"] = "1" ENV["HOMEBREW_DEVELOPER"] = "1"
test "brew", "install", *install_args test "brew", "install", *install_args
install_passed = steps.last.passed? install_passed = steps.last.passed?
test "brew", "audit", formula_name audit_args = [formula_name]
audit_args << "--strict" if @added_formulae.include? formula_name
test "brew", "audit", *audit_args
if install_passed if install_passed
unless ARGV.include? '--no-bottle' unless ARGV.include? '--no-bottle'
bottle_args = ["--rb", formula_name] bottle_args = ["--rb", formula_name]
@ -442,7 +450,7 @@ module Homebrew
test "brew", "fetch", "--retry", "--devel", *formula_fetch_options test "brew", "fetch", "--retry", "--devel", *formula_fetch_options
test "brew", "install", "--devel", "--verbose", formula_name test "brew", "install", "--devel", "--verbose", formula_name
devel_install_passed = steps.last.passed? devel_install_passed = steps.last.passed?
test "brew", "audit", "--devel", formula_name test "brew", "audit", "--devel", *audit_args
if devel_install_passed if devel_install_passed
test "brew", "test", "--devel", "--verbose", formula_name if formula.test_defined? test "brew", "test", "--devel", "--verbose", formula_name if formula.test_defined?
test "brew", "uninstall", "--devel", "--force", formula_name test "brew", "uninstall", "--devel", "--force", formula_name